Merge "Move rabbit's clustering port away from the ephemeral port range"

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

diff --git a/puppet/services/glance-api.yaml b/puppet/services/glance-api.yaml
index 94f9b9a..03abe79 100644 (file)
--- a/puppet/services/glance-api.yaml
+++ b/puppet/services/glance-api.yaml
@@ -73,12 +73,16 @@ parameters:
     type: string
     default: 'regionOne'
     description: Keystone region for endpoint
+  MonitoringSubscriptionGlanceApi:
+    default: 'overcloud-glance-api'
+    type: string
 
 outputs:
   role_data:
     description: Role data for the Glance API role.
     value:
       service_name: glance_api
+      monitoring_subscription: {get_param: MonitoringSubscriptionGlanceApi}
       config_settings:
         glance::api::database_connection:
           list_join:
@@ -97,6 +101,7 @@ outputs:
             template: "'REGISTRY_HOST'"
             params:
               REGISTRY_HOST: {get_param: [EndpointMap, GlanceRegistryInternal, host]}
+        glance::api::registry_client_protocol: {get_param: [EndpointMap, GlanceRegistryInternal, protocol] }
         glance::api::authtoken::password: {get_param: GlancePassword}
         glance::api::enable_proxy_headers_parsing: true
         glance::api::debug: {get_param: Debug}