Merge "Enable ZooKeeper when Storm is enabled"

ansible/group_vars/all.yml

@@ -666,7 +666,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' }}"

etc/kolla/globals.yml

@@ -356,7 +356,7 @@
 #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"
 
 ##################

releasenotes/notes/storm-enable-zookeeper-2108156acced1c57.yaml

+---
+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.