Merge "Use the make_url function to build URLs"

1 files changed, 10 insertions, 10 deletions

diff --git a/puppet/services/manila-base.yaml b/puppet/services/manila-base.yaml
index c183bc08..37b2ce8e 100644
--- a/puppet/services/manila-base.yaml
+++ b/puppet/services/manila-base.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   Openstack Manila base service. Shared by manila-api/scheduler/share services
@@ -59,15 +59,15 @@ outputs:
         manila::db::database_db_max_retries: -1
         manila::db::database_max_retries: -1
         manila::sql_connection:
-          list_join:
-          - ''
-          - - {get_param: [EndpointMap, MysqlInternal, protocol]}
-            - '://manila:'
-            - {get_param: ManilaPassword}
-            - '@'
-            - {get_param: [EndpointMap, MysqlInternal, host]}
-            - '/manila'
-            - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
+          make_url:
+            scheme: {get_param: [EndpointMap, MysqlInternal, protocol]}
+            username: manila
+            password: {get_param: ManilaPassword}
+            host: {get_param: [EndpointMap, MysqlInternal, host]}
+            path: /manila
+            query:
+              read_default_file: /etc/my.cnf.d/tripleo.cnf
+              read_default_group: tripleo
       service_config_settings:
         mysql:
           manila::db::mysql::password: {get_param: ManilaPassword}