From 45e1385386a54f00a8bae79da8bb2dae9ec3a775 Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Wed, 24 Jun 2020 14:56:33 +0200
Subject: [PATCH] Enable ZooKeeper when Storm is enabled

ZooKeeper is a dependency of Apache Storm.

TrivialFix

Change-Id: Icf952be2e0b53f2e82e8ce18a48bcfa100b41cd9
(cherry picked from commit 866784c77a101bff0dfd606f8a2761376a9b1acc)
---
 ansible/group_vars/all.yml                             |  2 +-
 etc/kolla/globals.yml                                  |  2 +-
 .../notes/storm-enable-zookeeper-2108156acced1c57.yaml | 10 ++++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/storm-enable-zookeeper-2108156acced1c57.yaml

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 0dbebc4bc5..974e9c89d5 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -636,7 +636,7 @@ enable_trove_singletenant: "no"
 enable_vitrage: "no"
 enable_vmtp: "no"
 enable_watcher: "no"
-enable_zookeeper: "{{ enable_kafka | bool }}"
+enable_zookeeper: "{{ enable_kafka | bool or enable_storm | bool }}"
 enable_zun: "no"
 
 ovs_datapath: "{{ 'netdev' if enable_ovs_dpdk | bool else 'system' }}"
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index b416e1854d..a9f89d10f4 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -322,7 +322,7 @@ kolla_internal_vip_address: "10.10.10.254"
 #enable_vitrage: "no"
 #enable_vmtp: "no"
 #enable_watcher: "no"
-#enable_zookeeper: "no"
+#enable_zookeeper: "{{ enable_kafka | bool or enable_storm | bool }}"
 #enable_zun: "no"
 
 ##############
diff --git a/releasenotes/notes/storm-enable-zookeeper-2108156acced1c57.yaml b/releasenotes/notes/storm-enable-zookeeper-2108156acced1c57.yaml
new file mode 100644
index 0000000000..e0e8e40482
--- /dev/null
+++ b/releasenotes/notes/storm-enable-zookeeper-2108156acced1c57.yaml
@@ -0,0 +1,10 @@
+---
+upgrade:
+  - |
+    Apache ZooKeeper will now be automatically deployed whenever Apache Storm
+    is enabled.
+fixes:
+  - |
+    Deploys Apache ZooKeeper if Apache Storm is enabled explicitly. ZooKeeper
+    would only be deployed if Apache Kafka was also enabled, which is often
+    done implicitly by enabling Monasca.