From d8a300cc24ee930da176ddab552a3f983a8fb3ce Mon Sep 17 00:00:00 2001
From: Doug Szumski <doug@stackhpc.com>
Date: Thu, 29 Mar 2018 10:16:40 +0100
Subject: [PATCH] Add support for deploying Monasca

Change-Id: I63298ae65b9e7bfae340b5448107540a3e518496
Story: 2001627
Task: 6704
---
 ansible/group_vars/all/kolla                   | 10 +++++-----
 .../templates/overcloud-services.j2            | 18 ++++++++++++++++++
 .../kolla-ansible/tests/test-defaults.yml      |  1 +
 .../roles/kolla-ansible/tests/test-extras.yml  |  1 +
 .../roles/kolla-openstack/defaults/main.yml    |  3 ---
 .../molecule/default/tests/test_default.py     |  1 +
 .../molecule/enable-everything/molecule.yml    |  2 +-
 .../enable-everything/tests/test_default.py    |  1 +
 ansible/roles/kolla-openstack/vars/main.yml    |  5 +++++
 .../notes/add-monasca-3e6da709b3b4c269.yaml    |  4 ++++
 10 files changed, 37 insertions(+), 9 deletions(-)
 create mode 100644 releasenotes/notes/add-monasca-3e6da709b3b4c269.yaml

diff --git a/ansible/group_vars/all/kolla b/ansible/group_vars/all/kolla
index 4a282fb61..0362a9afd 100644
--- a/ansible/group_vars/all/kolla
+++ b/ansible/group_vars/all/kolla
@@ -125,7 +125,7 @@ overcloud_container_image_regex_map:
   - regex: dnsmasq
     enabled: "{{ kolla_enable_ironic | bool }}"
   - regex: elasticsearch
-    enabled: "{{ kolla_enable_elasticsearch | bool }}"
+    enabled: "{{ kolla_enable_elasticsearch | bool or kolla_enable_monasca | bool }}"
   - regex: etcd
     enabled: "{{ kolla_enable_etcd | bool }}"
   - regex: fluentd
@@ -133,7 +133,7 @@ overcloud_container_image_regex_map:
   - regex: glance
     enabled: "{{ kolla_enable_glance | bool }}"
   - regex: grafana
-    enabled: "{{ kolla_enable_grafana | bool }}"
+    enabled: "{{ kolla_enable_grafana | bool or kolla_enable_monasca | bool }}"
   - regex: gnocchi
     enabled: "{{ kolla_enable_gnocchi | bool }}"
   - regex: ^haproxy$
@@ -143,7 +143,7 @@ overcloud_container_image_regex_map:
   - regex: horizon
     enabled: "{{ kolla_enable_horizon | bool }}"
   - regex: influxdb
-    enabled: "{{ kolla_enable_influxdb | bool }}"
+    enabled: "{{ kolla_enable_influxdb | bool or kolla_enable_monasca | bool }}"
   - regex: ironic
     enabled: "{{ kolla_enable_ironic | bool }}"
   - regex: ironic-neutron-agent
@@ -151,13 +151,13 @@ overcloud_container_image_regex_map:
   - regex: iscsid
     enabled: "{{ kolla_enable_cinder | bool or kolla_enable_ironic | bool }}"
   - regex: kafka
-    enabled: "{{ kolla_enable_kafka | bool }}"
+    enabled: "{{ kolla_enable_kafka | bool or kolla_enable_monasca | bool }}"
   - regex: keepalived
     enabled: "{{ kolla_enable_haproxy | bool }}"
   - regex: keystone
     enabled: True
   - regex: kibana
-    enabled: "{{ kolla_enable_kibana | bool }}"
+    enabled: "{{ kolla_enable_kibana | bool or kolla_enable_monasca | bool }}"
   - regex: kolla-toolbox
     enabled: True
   - regex: magnum
diff --git a/ansible/roles/kolla-ansible/templates/overcloud-services.j2 b/ansible/roles/kolla-ansible/templates/overcloud-services.j2
index 69d986eb2..f0278bdde 100644
--- a/ansible/roles/kolla-ansible/templates/overcloud-services.j2
+++ b/ansible/roles/kolla-ansible/templates/overcloud-services.j2
@@ -191,6 +191,24 @@ monasca
 [monasca-log-api:children]
 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-api:children]
 murano
diff --git a/ansible/roles/kolla-ansible/tests/test-defaults.yml b/ansible/roles/kolla-ansible/tests/test-defaults.yml
index bf43091b9..31cb585a3 100644
--- a/ansible/roles/kolla-ansible/tests/test-defaults.yml
+++ b/ansible/roles/kolla-ansible/tests/test-defaults.yml
@@ -97,6 +97,7 @@
               - enable_kafka
               - enable_influxdb
               - enable_mariadb
+              - enable_monasca
               - enable_neutron
               - enable_nova
               - enable_zookeeper
diff --git a/ansible/roles/kolla-ansible/tests/test-extras.yml b/ansible/roles/kolla-ansible/tests/test-extras.yml
index ef54c05e0..12cb9d652 100644
--- a/ansible/roles/kolla-ansible/tests/test-extras.yml
+++ b/ansible/roles/kolla-ansible/tests/test-extras.yml
@@ -260,6 +260,7 @@
               #enable_manila_backend_hnas: True
               #enable_mariadb: True
               #enable_mistral: True
+              #enable_monasca: True
               #enable_mongodb: True
               #enable_murano: True
               #enable_multipathd: True
diff --git a/ansible/roles/kolla-openstack/defaults/main.yml b/ansible/roles/kolla-openstack/defaults/main.yml
index 284b189b2..27caa1147 100644
--- a/ansible/roles/kolla-openstack/defaults/main.yml
+++ b/ansible/roles/kolla-openstack/defaults/main.yml
@@ -294,9 +294,6 @@ kolla_enable_manila:
 ###############################################################################
 # 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.
 kolla_enable_monasca:
 
diff --git a/ansible/roles/kolla-openstack/molecule/default/tests/test_default.py b/ansible/roles/kolla-openstack/molecule/default/tests/test_default.py
index c86d96e7d..bf86823a7 100644
--- a/ansible/roles/kolla-openstack/molecule/default/tests/test_default.py
+++ b/ansible/roles/kolla-openstack/molecule/default/tests/test_default.py
@@ -50,6 +50,7 @@ def test_service_config_directory(host, path):
      'magnum',
      'manila',
      'mariadb',
+     'monasca',
      'murano',
      'neutron',
      'nova',
diff --git a/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml b/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml
index c23867463..fca21ca7a 100644
--- a/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml
+++ b/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml
@@ -67,8 +67,8 @@ provisioner:
         kolla_extra_mariadb: |
           [extra-galera.cnf]
           foo=bar
-        kolla_enable_murano: true
         kolla_enable_monasca: true
+        kolla_enable_murano: true
         kolla_extra_murano: |
           [extra-murano.conf]
           foo=bar
diff --git a/ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py b/ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py
index 089e27edd..c18be65d3 100644
--- a/ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py
+++ b/ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py
@@ -43,6 +43,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
      'magnum',
      'manila',
      'mariadb',
+     'monasca',
      'murano',
      'neutron',
      'nova',
diff --git a/ansible/roles/kolla-openstack/vars/main.yml b/ansible/roles/kolla-openstack/vars/main.yml
index b9e1861b2..4dca83621 100644
--- a/ansible/roles/kolla-openstack/vars/main.yml
+++ b/ansible/roles/kolla-openstack/vars/main.yml
@@ -96,6 +96,11 @@ kolla_openstack_custom_config:
     dest: "{{ kolla_node_custom_config_path }}/mariadb"
     patterns: "*"
     enabled: "{{ kolla_enable_mariadb }}"
+  # Monasca.
+  - src: "{{ kolla_extra_config_path }}/monasca"
+    dest: "{{ kolla_node_custom_config_path }}/monasca"
+    patterns: "*"
+    enabled: "{{ kolla_enable_monasca }}"
   # Murano.
   - src: "{{ kolla_extra_config_path }}/murano"
     dest: "{{ kolla_node_custom_config_path }}/murano"
diff --git a/releasenotes/notes/add-monasca-3e6da709b3b4c269.yaml b/releasenotes/notes/add-monasca-3e6da709b3b4c269.yaml
new file mode 100644
index 000000000..9b7bc4352
--- /dev/null
+++ b/releasenotes/notes/add-monasca-3e6da709b3b4c269.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - Add support for OpenStack Monasca which provides monitoring-as-a-service
+    for OpenStack at scale.