Merge "Set VNC URL parameters for nova-compute"

[apex-tripleo-heat-templates.git] / puppet / services / pacemaker / gnocchi-api.yaml

diff --git a/puppet/services/pacemaker/gnocchi-api.yaml b/puppet/services/pacemaker/gnocchi-api.yaml
index 1f6ed46..6a9161f 100644 (file)
--- a/puppet/services/pacemaker/gnocchi-api.yaml
+++ b/puppet/services/pacemaker/gnocchi-api.yaml
@@ -18,10 +18,13 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  MonitoringSubscriptionGnocchiApi:
+    default: 'overcloud-gnocchi-api'
+    type: string
 
 resources:
   GnocchiServiceBase:
-    type: ../gnocchi-base.yaml
+    type: ../gnocchi-api.yaml
     properties:
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
@@ -32,8 +35,11 @@ outputs:
     description: Role data for the Gnocchi role.
     value:
       service_name: gnocchi_api
+      monitoring_subscription: {get_param: MonitoringSubscriptionGnocchiApi}
       config_settings:
         map_merge:
           - get_attr: [GnocchiServiceBase, role_data, config_settings]
+          - gnocchi::metricd::manage_service: false
+            gnocchi::metricd::enabled: false
       step_config: |
         include ::tripleo::profile::pacemaker::gnocchi::api