bug 1462277. set max local storage

openshift · Jun 20, 2017 · 5211196 · 5211196
1 parent 84a5c99
commit 5211196
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/deployer/conf/elasticsearch.yml b/deployer/conf/elasticsearch.yml
@@ -17,6 +17,7 @@ index:
 node:
   master: true
   data: true
+  max_local_storage_nodes: 1
 
 network:
   host: 0.0.0.0

diff --git a/deployer/scripts/upgrade.sh b/deployer/scripts/upgrade.sh
@@ -670,6 +670,18 @@ function update_es_for_235() {
   done
 }
 
+#https://bugzilla.redhat.com/show_bug.cgi?id=1462277
+function update_es_max_local_storage() {
+    if oc get configmap logging-elasticsearch -o yaml | grep -q max_local_storage_nodes > /dev/null ; then
+        return 0
+    fi
+
+    oc get configmap logging-elasticsearch -o yaml | \
+        sed -e '/^  elasticsearch.yml: /a\
+    data: true' -e '/^  elasticsearch.yml: /a\
+    data: true\n  max_local_storage_nodes: 1' | oc replace -f -
+}
+
 # https://bugzilla.redhat.com/show_bug.cgi?id=1439554
 function update_es_for_min_masters() {
   echo "Fixing MIN_MASTERS in elasticsearch.yaml conf"
@@ -983,6 +995,8 @@ function upgrade_logging() {
     fi
   done
 
+  update_es_max_local_storage
+
   scaleUp
 
   if [[ $installedVersion -ne $LOGGING_VERSION ]]; then