From e14dfc832999b9f708fe54eebeae80ef16a22892 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Wed, 27 Feb 2019 10:11:47 -0500
Subject: [PATCH] Fix monitoring_subscription on misc services

Some of these were missing or got dropped due to recent flattening
efforts.

Change-Id: I7c7c2ea134aa8b18c7d19c3d9435c90cc49cda77
---
 .../ceilometer/ceilometer-agent-ipmi-container-puppet.yaml       | 1 +
 deployment/manila/manila-api-container-puppet.yaml               | 1 +
 deployment/nova/nova-api-container-puppet.yaml                   | 1 +
 deployment/nova/nova-conductor-container-puppet.yaml             | 1 +
 deployment/nova/nova-libvirt-container-puppet.yaml               | 1 +
 deployment/nova/nova-metadata-container-puppet.yaml              | 1 +
 deployment/nova/nova-placement-container-puppet.yaml             | 1 +
 deployment/nova/nova-scheduler-container-puppet.yaml             | 1 +
 8 files changed, 8 insertions(+)

diff --git a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
index eb96923d04..93a14c84b3 100644
--- a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
+++ b/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
@@ -83,6 +83,7 @@ outputs:
     description: Role data for the Ceilometer Agent Ipmi role.
     value:
       service_name: ceilometer_agent_ipmi
+      monitoring_subscription: {get_param: MonitoringSubscriptionCeilometerIpmi}
       config_settings:
         map_merge:
           - get_attr: [CeilometerServiceBase, role_data, config_settings]
diff --git a/deployment/manila/manila-api-container-puppet.yaml b/deployment/manila/manila-api-container-puppet.yaml
index b2b93b9dba..259f9e5bac 100644
--- a/deployment/manila/manila-api-container-puppet.yaml
+++ b/deployment/manila/manila-api-container-puppet.yaml
@@ -94,6 +94,7 @@ outputs:
     description: Role data for the Manila API role.
     value:
       service_name: manila_api
+      monitoring_subscription: {get_param: MonitoringSubscriptionManilaApi}
       config_settings:
         map_merge:
           - get_attr: [ManilaBase, role_data, config_settings]
diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml
index 6ffb92bb4b..74a0b3be40 100644
--- a/deployment/nova/nova-api-container-puppet.yaml
+++ b/deployment/nova/nova-api-container-puppet.yaml
@@ -181,6 +181,7 @@ outputs:
     description: Role data for the Nova API role.
     value:
       service_name: nova_api
+      monitoring_subscription: {get_param: MonitoringSubscriptionNovaApi}
       config_settings:
         map_merge:
           - get_attr: [NovaBase, role_data, config_settings]
diff --git a/deployment/nova/nova-conductor-container-puppet.yaml b/deployment/nova/nova-conductor-container-puppet.yaml
index b5b22e637c..5e23821966 100644
--- a/deployment/nova/nova-conductor-container-puppet.yaml
+++ b/deployment/nova/nova-conductor-container-puppet.yaml
@@ -111,6 +111,7 @@ outputs:
     description: Role data for the Nova Conductor service.
     value:
       service_name: nova_conductor
+      monitoring_subscription: {get_param: MonitoringSubscriptionNovaConductor}
       config_settings:
         map_merge:
           - {get_attr: [NovaBase, role_data, config_settings]}
diff --git a/deployment/nova/nova-libvirt-container-puppet.yaml b/deployment/nova/nova-libvirt-container-puppet.yaml
index ff6c4c5911..5b328c42d4 100644
--- a/deployment/nova/nova-libvirt-container-puppet.yaml
+++ b/deployment/nova/nova-libvirt-container-puppet.yaml
@@ -315,6 +315,7 @@ outputs:
     description: Role data for the Libvirt service.
     value:
       service_name: nova_libvirt
+      monitoring_subscription: {get_param: MonitoringSubscriptionNovaLibvirt}
       config_settings:
         map_merge:
           - get_attr: [NovaBase, role_data, config_settings]
diff --git a/deployment/nova/nova-metadata-container-puppet.yaml b/deployment/nova/nova-metadata-container-puppet.yaml
index 080a7192a7..cbe9181215 100644
--- a/deployment/nova/nova-metadata-container-puppet.yaml
+++ b/deployment/nova/nova-metadata-container-puppet.yaml
@@ -111,6 +111,7 @@ outputs:
     description: Role data for the Nova Metadata service.
     value:
       service_name: nova_metadata
+      monitoring_subscription: {get_param: MonitoringSubscriptionNovaMetadata}
       config_settings:
         map_merge:
           - get_attr: [NovaBase, role_data, config_settings]
diff --git a/deployment/nova/nova-placement-container-puppet.yaml b/deployment/nova/nova-placement-container-puppet.yaml
index 56ccd3fb3e..cc99d585bc 100644
--- a/deployment/nova/nova-placement-container-puppet.yaml
+++ b/deployment/nova/nova-placement-container-puppet.yaml
@@ -106,6 +106,7 @@ outputs:
     description: Role data for the Nova Placement API role.
     value:
       service_name: nova_placement
+      monitoring_subscription: {get_param: MonitoringSubscriptionNovaPlacement}
       config_settings:
         map_merge:
           - get_attr: [NovaBase, role_data, config_settings]
diff --git a/deployment/nova/nova-scheduler-container-puppet.yaml b/deployment/nova/nova-scheduler-container-puppet.yaml
index 3396a1c7d5..b040b78d0b 100644
--- a/deployment/nova/nova-scheduler-container-puppet.yaml
+++ b/deployment/nova/nova-scheduler-container-puppet.yaml
@@ -113,6 +113,7 @@ outputs:
     description: Role data for the Nova Scheduler service.
     value:
       service_name: nova_scheduler
+      monitoring_subscription: {get_param: MonitoringSubscriptionNovaScheduler}
       config_settings:
         map_merge:
           - {get_attr: [NovaBase, role_data, config_settings]}