Merge "Add support for deploying Apache Storm"

ansible/group_vars/all/kolla

@@ -189,6 +189,8 @@ overcloud_container_image_regex_map:
     enabled: "{{ kolla_enable_sahara | bool }}"
   - regex: skydive
     enabled: "{{ kolla_enable_skydive | bool }}"
+  - regex: storm
+    enabled: "{{ kolla_enable_storm | bool }}"
   - regex: swift
     enabled: "{{ kolla_enable_swift | bool }}"
   - regex: telegraf
@@ -361,9 +363,10 @@ kolla_enable_osprofiler: "no"
 kolla_enable_prometheus: "no"
 kolla_enable_sahara: "no"
 kolla_enable_skydive: "no"
+kolla_enable_storm: "{{ 'yes' if kolla_enable_monasca | bool else 'no' }}"
 kolla_enable_swift: "no"
 kolla_enable_telegraf: "no"
-kolla_enable_zookeeper: "{{ 'yes' if kolla_enable_kafka | bool else 'no' }}"
+kolla_enable_zookeeper: "{{ 'yes' if kolla_enable_kafka | bool or kolla_enable_storm | bool else 'no' }}"
 
 ###############################################################################
 # Passwords and credentials.

ansible/roles/kolla-ansible/defaults/main.yml

@@ -243,6 +243,7 @@ kolla_openstack_logging_debug:
 #kolla_enable_rally:
 #kolla_enable_sahara:
 #kolla_enable_senlin:
+#kolla_enable_storm:
 #kolla_enable_swift:
 #kolla_enable_telegraf:
 #kolla_enable_tempest:

ansible/roles/kolla-ansible/templates/overcloud-components.j2

@@ -131,6 +131,9 @@ control
 [monasca:children]
 monitoring
 
+[storm:children]
+monitoring
+
 [murano:children]
 control
 

ansible/roles/kolla-ansible/templates/overcloud-services.j2

@@ -209,6 +209,13 @@ monasca
 [monasca-persister:children]
 monasca
 
+# Storm
+[storm-worker:children]
+storm
+
+[storm-nimbus:children]
+storm
+
 # Murano
 [murano-api:children]
 murano

ansible/roles/kolla-ansible/tests/test-defaults.yml

@@ -100,6 +100,7 @@
               - enable_monasca
               - enable_neutron
               - enable_nova
+              - enable_storm
               - enable_zookeeper
               - grafana_admin_username
               - network_interface

ansible/roles/kolla-ansible/tests/test-extras.yml

@@ -153,6 +153,7 @@
             kolla_enable_senlin: True
             kolla_enable_skydive: True
             kolla_enable_solum: True
+            kolla_enable_storm: True
             kolla_enable_swift: True
             kolla_enable_tacker: True
             kolla_enable_telegraf: True
@@ -282,6 +283,7 @@
               #enable_skydive: True
               #enable_solum: True
               #enable_senlin: True
+              #enable_storm: True
               #enable_swift: True
               #enable_tacker: True
               #enable_telegraf: True

ansible/roles/kolla-ansible/vars/main.yml

@@ -128,6 +128,7 @@ kolla_feature_flags:
   - senlin
   - skydive
   - solum
+  - storm
   - swift
   - tacker
   - telegraf

ansible/roles/kolla-openstack/defaults/main.yml

@@ -370,6 +370,12 @@ kolla_enable_sahara:
 # Free form extra configuration to append to sahara.conf.
 kolla_extra_sahara:
 
+###############################################################################
+# Storm configuration.
+
+# Whether to enable Storm.
+kolla_enable_storm:
+
 ###############################################################################
 # Swift configuration.
 

ansible/roles/kolla-openstack/molecule/default/tests/test_default.py

@@ -55,6 +55,7 @@ def test_service_config_directory(host, path):
      'neutron',
      'nova',
      'sahara',
+     'storm',
      'swift',
      'zookeeper'])
 def test_service_config_directory_absent(host, path):

ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml

@@ -88,6 +88,7 @@ provisioner:
           [extra-sahara.conf]
           foo=bar
         kolla_enable_swift: true
+        kolla_enable_storm: true
         kolla_enable_zookeeper: true
         kolla_extra_zookeeper: |
           [extra-zookeeper.cfg]

ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py

@@ -48,6 +48,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
      'neutron',
      'nova',
      'sahara',
+     'storm',
      'swift',
      'zookeeper'])
 def test_service_config_directory(host, path):

ansible/roles/kolla-openstack/vars/main.yml

@@ -59,6 +59,11 @@ kolla_openstack_custom_config:
     dest: "{{ kolla_node_custom_config_path }}/influxdb"
     patterns: "*"
     enabled: "{{ kolla_enable_influxdb }}"
+  # Storm.
+  - src: "{{ kolla_extra_config_path }}/storm"
+    dest: "{{ kolla_node_custom_config_path }}/storm"
+    patterns: "*"
+    enabled: "{{ kolla_enable_storm }}"
   # Ironic.
   - src: "{{ kolla_extra_config_path }}/ironic"
     dest: "{{ kolla_node_custom_config_path }}/ironic"

etc/kayobe/kolla.yml

@@ -224,6 +224,7 @@
 #kolla_enable_senlin:
 #kolla_enable_skydive:
 #kolla_enable_solum:
+#kolla_enable_storm:
 #kolla_enable_swift:
 #kolla_enable_tacker:
 #kolla_enable_telegraf:

releasenotes/notes/add-storm-5d29163b61ef01ce.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - Add support for deploying Apache Storm which is used by Monasca
+    for alerting.