From b26fe7d164eeeef6487628208c0ad0f16332331c Mon Sep 17 00:00:00 2001
From: Zane Bitter <zbitter@redhat.com>
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/panko-base.yaml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'puppet/services/panko-base.yaml')

diff --git a/puppet/services/panko-base.yaml b/puppet/services/panko-base.yaml
index fda13450..78d4bc3e 100644
--- a/puppet/services/panko-base.yaml
+++ b/puppet/services/panko-base.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack Panko service configured with Puppet
@@ -38,15 +38,15 @@ outputs:
       service_name: panko_base
       config_settings:
         panko::db::database_connection:
-          list_join:
-            - ''
-            - - {get_param: [EndpointMap, MysqlInternal, protocol]}
-              - '://panko:'
-              - {get_param: PankoPassword}
-              - '@'
-              - {get_param: [EndpointMap, MysqlInternal, host]}
-              - '/panko'
-              - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
+          make_url:
+            scheme: {get_param: [EndpointMap, MysqlInternal, protocol]}
+            username: panko
+            password: {get_param: PankoPassword}
+            host: {get_param: [EndpointMap, MysqlInternal, host]}
+            path: /panko
+            query:
+              read_default_file: /etc/my.cnf.d/tripleo.cnf
+              read_default_group: tripleo
         panko::debug: {get_param: Debug}
         panko::auth::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
         panko::keystone::authtoken::project_name: 'service'
-- 
cgit 1.2.3-korg