Add support for deploying Monasca

Change-Id: I63298ae65b9e7bfae340b5448107540a3e518496
Story: 2001627
Task: 6704
This commit is contained in:
Doug Szumski 2018-03-29 10:16:40 +01:00
parent bea399ef81
commit d8a300cc24
10 changed files with 37 additions and 9 deletions

View File

@ -125,7 +125,7 @@ overcloud_container_image_regex_map:
- regex: dnsmasq - regex: dnsmasq
enabled: "{{ kolla_enable_ironic | bool }}" enabled: "{{ kolla_enable_ironic | bool }}"
- regex: elasticsearch - regex: elasticsearch
enabled: "{{ kolla_enable_elasticsearch | bool }}" enabled: "{{ kolla_enable_elasticsearch | bool or kolla_enable_monasca | bool }}"
- regex: etcd - regex: etcd
enabled: "{{ kolla_enable_etcd | bool }}" enabled: "{{ kolla_enable_etcd | bool }}"
- regex: fluentd - regex: fluentd
@ -133,7 +133,7 @@ overcloud_container_image_regex_map:
- regex: glance - regex: glance
enabled: "{{ kolla_enable_glance | bool }}" enabled: "{{ kolla_enable_glance | bool }}"
- regex: grafana - regex: grafana
enabled: "{{ kolla_enable_grafana | bool }}" enabled: "{{ kolla_enable_grafana | bool or kolla_enable_monasca | bool }}"
- regex: gnocchi - regex: gnocchi
enabled: "{{ kolla_enable_gnocchi | bool }}" enabled: "{{ kolla_enable_gnocchi | bool }}"
- regex: ^haproxy$ - regex: ^haproxy$
@ -143,7 +143,7 @@ overcloud_container_image_regex_map:
- regex: horizon - regex: horizon
enabled: "{{ kolla_enable_horizon | bool }}" enabled: "{{ kolla_enable_horizon | bool }}"
- regex: influxdb - regex: influxdb
enabled: "{{ kolla_enable_influxdb | bool }}" enabled: "{{ kolla_enable_influxdb | bool or kolla_enable_monasca | bool }}"
- regex: ironic - regex: ironic
enabled: "{{ kolla_enable_ironic | bool }}" enabled: "{{ kolla_enable_ironic | bool }}"
- regex: ironic-neutron-agent - regex: ironic-neutron-agent
@ -151,13 +151,13 @@ overcloud_container_image_regex_map:
- regex: iscsid - regex: iscsid
enabled: "{{ kolla_enable_cinder | bool or kolla_enable_ironic | bool }}" enabled: "{{ kolla_enable_cinder | bool or kolla_enable_ironic | bool }}"
- regex: kafka - regex: kafka
enabled: "{{ kolla_enable_kafka | bool }}" enabled: "{{ kolla_enable_kafka | bool or kolla_enable_monasca | bool }}"
- regex: keepalived - regex: keepalived
enabled: "{{ kolla_enable_haproxy | bool }}" enabled: "{{ kolla_enable_haproxy | bool }}"
- regex: keystone - regex: keystone
enabled: True enabled: True
- regex: kibana - regex: kibana
enabled: "{{ kolla_enable_kibana | bool }}" enabled: "{{ kolla_enable_kibana | bool or kolla_enable_monasca | bool }}"
- regex: kolla-toolbox - regex: kolla-toolbox
enabled: True enabled: True
- regex: magnum - regex: magnum

View File

@ -191,6 +191,24 @@ monasca
[monasca-log-api:children] [monasca-log-api:children]
monasca monasca
[monasca-log-transformer:children]
monasca
[monasca-log-persister:children]
monasca
[monasca-log-metrics:children]
monasca
[monasca-thresh:children]
monasca
[monasca-notification:children]
monasca
[monasca-persister:children]
monasca
# Murano # Murano
[murano-api:children] [murano-api:children]
murano murano

View File

@ -97,6 +97,7 @@
- enable_kafka - enable_kafka
- enable_influxdb - enable_influxdb
- enable_mariadb - enable_mariadb
- enable_monasca
- enable_neutron - enable_neutron
- enable_nova - enable_nova
- enable_zookeeper - enable_zookeeper

View File

@ -260,6 +260,7 @@
#enable_manila_backend_hnas: True #enable_manila_backend_hnas: True
#enable_mariadb: True #enable_mariadb: True
#enable_mistral: True #enable_mistral: True
#enable_monasca: True
#enable_mongodb: True #enable_mongodb: True
#enable_murano: True #enable_murano: True
#enable_multipathd: True #enable_multipathd: True

View File

@ -294,9 +294,6 @@ kolla_enable_manila:
############################################################################### ###############################################################################
# Monasca configuration. # Monasca configuration.
# NOTE: Support for Monasca in Kolla is a work in progress. This currently
# relies on an out-of-band Monasca installation.
# Whether to enable Monasca. # Whether to enable Monasca.
kolla_enable_monasca: kolla_enable_monasca:

View File

@ -50,6 +50,7 @@ def test_service_config_directory(host, path):
'magnum', 'magnum',
'manila', 'manila',
'mariadb', 'mariadb',
'monasca',
'murano', 'murano',
'neutron', 'neutron',
'nova', 'nova',

View File

@ -67,8 +67,8 @@ provisioner:
kolla_extra_mariadb: | kolla_extra_mariadb: |
[extra-galera.cnf] [extra-galera.cnf]
foo=bar foo=bar
kolla_enable_murano: true
kolla_enable_monasca: true kolla_enable_monasca: true
kolla_enable_murano: true
kolla_extra_murano: | kolla_extra_murano: |
[extra-murano.conf] [extra-murano.conf]
foo=bar foo=bar

View File

@ -43,6 +43,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
'magnum', 'magnum',
'manila', 'manila',
'mariadb', 'mariadb',
'monasca',
'murano', 'murano',
'neutron', 'neutron',
'nova', 'nova',

View File

@ -96,6 +96,11 @@ kolla_openstack_custom_config:
dest: "{{ kolla_node_custom_config_path }}/mariadb" dest: "{{ kolla_node_custom_config_path }}/mariadb"
patterns: "*" patterns: "*"
enabled: "{{ kolla_enable_mariadb }}" enabled: "{{ kolla_enable_mariadb }}"
# Monasca.
- src: "{{ kolla_extra_config_path }}/monasca"
dest: "{{ kolla_node_custom_config_path }}/monasca"
patterns: "*"
enabled: "{{ kolla_enable_monasca }}"
# Murano. # Murano.
- src: "{{ kolla_extra_config_path }}/murano" - src: "{{ kolla_extra_config_path }}/murano"
dest: "{{ kolla_node_custom_config_path }}/murano" dest: "{{ kolla_node_custom_config_path }}/murano"

View File

@ -0,0 +1,4 @@
---
features:
- Add support for OpenStack Monasca which provides monitoring-as-a-service
for OpenStack at scale.