aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-26 11:48:02 +0000
committerGerrit Code Review <review@openstack.org>2016-09-26 11:48:02 +0000
commita9190021ab646c85acbc707c879f7aa3aa8f30cc (patch)
tree28765ef46f572458358cf51bce511023e9d74818
parent651c1ee4b2cb3464d28ab3754b1a078d15d51b81 (diff)
parent715530582461389efb77a07ab7b5804cf9968042 (diff)
downloadkolla-a9190021ab646c85acbc707c879f7aa3aa8f30cc.tar.gz
kolla-a9190021ab646c85acbc707c879f7aa3aa8f30cc.zip
Merge "Revert "Add enable_elasticsearch option""
-rw-r--r--ansible/group_vars/all.yml1
-rw-r--r--etc/kolla/globals.yml1
2 files changed, 0 insertions, 2 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 250f8bd81..52e7db6df 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -252,7 +252,6 @@ enable_cinder_backend_iscsi: "no"
enable_cinder_backend_lvm: "no"
enable_cloudkitty: "no"
enable_congress: "no"
-enable_elasticsearch: "no"
enable_etcd: "no"
enable_gnocchi: "no"
enable_grafana: "no"
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index 7abb7e677..bfb3d7d50 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -123,7 +123,6 @@ kolla_internal_vip_address: "10.10.10.254"
#enable_cinder_backend_lvm: "no"
#enable_cloudkitty: "no"
#enable_congress: "no"
-#enable_elasticsearch: "no"
#enable_etcd: "no"
#enable_gnocchi: "no"
#enable_grafana: "no"