X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fglance-registry.yaml;h=3377a572f5a64e1dbdd8b5505ede15060f472091;hb=c89097c20220bc2266872d7bb01cce28fa01793b;hp=d8861f708516db5953b86a55d245fd73911df3ce;hpb=6d12839f3655f8774ad227bfa4f3cf4d7b45acc5;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/glance-registry.yaml b/puppet/services/glance-registry.yaml
index d8861f70..3377a572 100644
--- a/puppet/services/glance-registry.yaml
+++ b/puppet/services/glance-registry.yaml
@@ -46,11 +46,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
@@ -66,5 +66,12 @@ outputs:
           '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