X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fkeystone.yaml;h=25d92d4acc9913164b52e706768ebdc1b2e2ca43;hb=244dcc434959eff291b4b6cc41993941db7e001e;hp=1654f0e7b91fe4b9d4d42a90cdb9f6a9c1acfffd;hpb=de0ac7b2d6a2b58e2c39f06c8d4a72278b574201;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml
index 1654f0e7..25d92d4a 100644
--- a/puppet/services/keystone.yaml
+++ b/puppet/services/keystone.yaml
@@ -54,9 +54,6 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
-  MysqlVirtualIPUri:
-    type: string
-    default: ''
   Debug:
     type: string
     default: ''
@@ -97,15 +94,15 @@ outputs:
     description: Role data for the Keystone role.
     value:
       config_settings:
-        keystone_dsn: &keystone_dsn
+        keystone::database_connection:
           list_join:
             - ''
-            - - 'mysql+pymysql://keystone:'
+            - - {get_param: [EndpointMap, MysqlInternal, protocol]}
+              - '://keystone:'
               - {get_param: AdminToken}
               - '@'
-              - {get_param: MysqlVirtualIPUri}
+              - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/keystone'
-        keystone::database_connection: *keystone_dsn
         keystone::admin_token: {get_param: AdminToken}
         keystone::roles::admin::password: {get_param: AdminPassword}
         keystone_ca_certificate: {get_param: KeystoneCACertificate}