Add support for deploying Apache Storm

Change-Id: I49afdddb8ba2f9cb4a08071c6acee3a3efb03305
Story: 2001627
Task: 6707
This commit is contained in:
Doug Szumski 2018-06-12 16:19:08 +01:00
parent d8a300cc24
commit d2d9f0d6b7
14 changed files with 38 additions and 1 deletions

View File

@ -191,6 +191,8 @@ overcloud_container_image_regex_map:
enabled: "{{ kolla_enable_sahara | bool }}" enabled: "{{ kolla_enable_sahara | bool }}"
- regex: skydive - regex: skydive
enabled: "{{ kolla_enable_skydive | bool }}" enabled: "{{ kolla_enable_skydive | bool }}"
- regex: storm
enabled: "{{ kolla_enable_storm | bool }}"
- regex: swift - regex: swift
enabled: "{{ kolla_enable_swift | bool }}" enabled: "{{ kolla_enable_swift | bool }}"
- regex: telegraf - regex: telegraf
@ -349,9 +351,10 @@ kolla_enable_osprofiler: "no"
kolla_enable_prometheus: "no" kolla_enable_prometheus: "no"
kolla_enable_sahara: "no" kolla_enable_sahara: "no"
kolla_enable_skydive: "no" kolla_enable_skydive: "no"
kolla_enable_storm: "{{ 'yes' if kolla_enable_monasca | bool else 'no' }}"
kolla_enable_swift: "no" kolla_enable_swift: "no"
kolla_enable_telegraf: "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. # Passwords and credentials.

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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