Merge "Add support for deploying Ceph RGW role"

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

diff --git a/puppet/services/glance-registry.yaml b/puppet/services/glance-registry.yaml
index d8861f7..d5f01d4 100644 (file)
--- a/puppet/services/glance-registry.yaml
+++ b/puppet/services/glance-registry.yaml
@@ -30,12 +30,16 @@ parameters:
     default: 0
     description: Number of workers for Glance service.
     type: number
+  MonitoringSubscriptionGlanceRegistry:
+    default: 'overcloud-glance-registry'
+    type: string
 
 outputs:
   role_data:
     description: Role data for the Glance Registry role.
     value:
       service_name: glance_registry
+      monitoring_subscription: {get_param: MonitoringSubscriptionGlanceRegistry}
       config_settings:
         glance::registry::database_connection:
           list_join:
@@ -46,11 +50,11 @@ outputs:
               - '@'
               - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/glance'
-        glance::registry::keystone_password: {get_param: GlancePassword}
-        glance::registry::keystone_tenant: 'service'
+        glance::registry::authtoken::password: {get_param: GlancePassword}
+        glance::registry::authtoken::project_name: 'service'
         glance::registry::pipeline: 'keystone'
-        glance::registry::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
-        glance::registry::identity_uri: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] }
+        glance::registry::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
+        glance::registry::authtoken::auth_url: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] }
         glance::registry::debug: {get_param: Debug}
         glance::registry::workers: {get_param: GlanceWorkers}
         glance::db::mysql::user: glance
@@ -61,10 +65,16 @@ outputs:
           - "%{hiera('mysql_bind_host')}"
         glance::registry::db::database_db_max_retries: -1
         glance::registry::db::database_max_retries: -1
-
         tripleo.glance_registry.firewall_rules:
           '112 glance_registry':
             dport:
               - 9191
+        # NOTE: bind IP is found in Heat replacing the network name with the
+        # local node IP for the given network; replacement examples
+        # (eg. for internal_api):
+        # internal_api -> IP
+        # internal_api_uri -> [IP]
+        # internal_api_subnet - > IP/CIDR
+        glance::registry::bind_host: {get_param: [ServiceNetMap, GlanceRegistryNetwork]}
       step_config: |
         include ::tripleo::profile::base::glance::registry