From b26fe7d164eeeef6487628208c0ad0f16332331c Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Fri, 5 May 2017 14:43:11 -0400 Subject: Use the make_url function to build URLs Change-Id: I2b23d92c85d5ecc889a7ee597b90e930bde9028e Depends-On: I72f84e737b042ecfaabf5639c6164d46a072b423 --- puppet/services/ec2-api.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'puppet/services/ec2-api.yaml') diff --git a/puppet/services/ec2-api.yaml b/puppet/services/ec2-api.yaml index 98d656a5..3b002880 100644 --- a/puppet/services/ec2-api.yaml +++ b/puppet/services/ec2-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: ocata +heat_template_version: pike description: > OpenStack EC2-API service configured with Puppet @@ -99,15 +99,15 @@ outputs: params: $NETWORK: {get_param: [ServiceNetMap, Ec2ApiMetadataNetwork]} ec2api::db::database_connection: - list_join: - - '' - - - {get_param: [EndpointMap, MysqlInternal, protocol]} - - '://ec2_api:' - - {get_param: Ec2ApiPassword} - - '@' - - {get_param: [EndpointMap, MysqlInternal, host]} - - '/ec2_api' - - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo' + make_url: + scheme: {get_param: [EndpointMap, MysqlInternal, protocol]} + username: ec2_api + password: {get_param: Ec2ApiPassword} + host: {get_param: [EndpointMap, MysqlInternal, host]} + path: /ec2_api + query: + read_default_file: /etc/my.cnf.d/tripleo.cnf + read_default_group: tripleo ec2api::api::keystone_ec2_tokens_url: list_join: - '' -- cgit 1.2.3-korg