Merge pull request #100 from scality/allow_disabling_es

Fix #98: allow elasticsearch to be disabled via configuration flag
scality · Jul 4, 2018 · 551d03d · 551d03d
2 parents 38a344b + d76220b
commit 551d03d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/metal-k8s.yml b/metal-k8s.yml
@@ -56,6 +56,7 @@
       tags: ['heapster']
     - role: kube_elasticsearch
       tags: ['elasticsearch']
+      when: metalk8s_elasticsearch_enabled|bool
     - role: kube_metrics_server
       tags: ['metrics-server']
 

diff --git a/roles/kube_elasticsearch/defaults/main.yml b/roles/kube_elasticsearch/defaults/main.yml
@@ -1,3 +1,6 @@
+metalk8s_elasticsearch_enabled: True
+
+
 debug: false
 
 remove_metal_k8s_temporary_file: true

diff --git a/tests/single-node/inventory/group_vars/k8s-cluster/single_node.yml b/tests/single-node/inventory/group_vars/k8s-cluster/single_node.yml
@@ -22,3 +22,5 @@ metal_k8s_storage_class:
             size: 11G
           lv02:
             size: 8G
+
+metalk8s_elasticsearch_enabled: False
diff --git a/tests/single-node/test.sh b/tests/single-node/test.sh
@@ -26,7 +26,7 @@ setup_suite() {
         make_shell true
 
         echo "Deploy the cluster"
-        make_shell ansible-playbook -i "$(pwd)/inventory" metal-k8s.yml --skip elasticsearch || die
+        make_shell ansible-playbook -i "$(pwd)/inventory" metal-k8s.yml|| die
 
         KUBECONFIG=$(pwd)/inventory/artifacts/admin.conf
         export KUBECONFIG