From 63dba94f427a273a09672cc9543a69a962130c27 Mon Sep 17 00:00:00 2001 From: Doug Szumski Date: Tue, 20 Feb 2018 12:59:24 +0000 Subject: [PATCH] Address review comments --- ansible/overcloud-grafana-configure.yml | 6 +++--- ansible/roles/kolla-ansible/vars/main.yml | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ansible/overcloud-grafana-configure.yml b/ansible/overcloud-grafana-configure.yml index 38c5d432f..a13f273d3 100644 --- a/ansible/overcloud-grafana-configure.yml +++ b/ansible/overcloud-grafana-configure.yml @@ -18,7 +18,7 @@ roles: - role: stackhpc.os-openstackclient os_openstackclient_venv: "{{ venv }}" - when: kolla_enable_monasca + when: kolla_enable_monasca | bool tasks: - name: Look up Monasca control plane project ID @@ -28,12 +28,12 @@ register: monasca_project_show changed_when: False environment: "{{ openstack_auth_env }}" - when: kolla_enable_monasca + when: kolla_enable_monasca | bool - name: Set Monasca control plane ID set_fact: monasca_control_plane_project_id: "{{ (monasca_project_show.stdout | from_json).get('id') }}" - when: kolla_enable_monasca + when: kolla_enable_monasca | bool - name: Configure control plane monitoring for Grafana # Only required to run on a single host. diff --git a/ansible/roles/kolla-ansible/vars/main.yml b/ansible/roles/kolla-ansible/vars/main.yml index b4fe9e19a..0fcf327f7 100644 --- a/ansible/roles/kolla-ansible/vars/main.yml +++ b/ansible/roles/kolla-ansible/vars/main.yml @@ -91,6 +91,7 @@ kolla_feature_flags: - manila_backend_hnas - mistral - mongodb + - monasca - murano - multipathd - neutron_dvr