From 715530582461389efb77a07ab7b5804cf9968042 Mon Sep 17 00:00:00 2001
From: caowei <cao.wei@99cloud.net>
Date: Sun, 25 Sep 2016 11:25:44 +0800
Subject: [PATCH] Revert "Add enable_elasticsearch option"

enable_elasticsearch option is already added,in https://github.com/openstack/kolla/blob/master/ansible/group_vars/all.yml#L303
elastic search enable or disable depends on "enable_central_logging" not on "enable_elasticsearch" in globals.yml file.
So remove enable_elasticsearch option from global.yml

This reverts commit f581c81ec630d5302707606228db323e51304a9c.
Change-Id: I1ceff747d7b978dc82efc55fda72b9b98c272f0d
---
 ansible/group_vars/all.yml | 1 -
 etc/kolla/globals.yml      | 1 -
 2 files changed, 2 deletions(-)

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 250f8bd817..52e7db6df2 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 7abb7e677c..bfb3d7d507 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"