Convert EndpointMap to not require per-service VIP parameters

[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 1a1a515..ca10fd1 100644 (file)
--- a/puppet/services/glance-registry.yaml
+++ b/puppet/services/glance-registry.yaml
@@ -9,9 +9,6 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
-  MysqlVirtualIPUri:
-    type: string
-    default: ''
   Debug:
     default: ''
     description: Set to True to enable debugging on all services.
@@ -29,20 +26,36 @@ outputs:
   role_data:
     description: Role data for the Glance Registry role.
     value:
+      service_name: glance_registry
       config_settings:
-        glance_dsn: &glance_dsn
+        glance::registry::database_connection:
           list_join:
             - ''
-            - - 'mysql+pymysql://glance:'
+            - - {get_param: [EndpointMap, MysqlInternal, protocol]}
+              - '://glance:'
               - {get_param: GlancePassword}
               - '@'
-              - {get_param: MysqlVirtualIPUri}
+              - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/glance'
         glance::registry::keystone_password: {get_param: GlancePassword}
-        glance::registry::database_connection: *glance_dsn
+        glance::registry::keystone_tenant: '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::debug: {get_param: Debug}
         glance::registry::workers: {get_param: GlanceWorkers}
+        glance::db::mysql::user: glance
+        glance::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
+        glance::db::mysql::dbname: glance
+        glance::db::mysql::allowed_hosts:
+          - '%'
+          - "%{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
       step_config: |
         include ::tripleo::profile::base::glance::registry