From 9a1bbde73bd8e52374257c53a9fb5df1b57fa55a Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 21 Mar 2023 00:56:33 +0900
Subject: [PATCH] Generate tooz_url using the new os_url function

The new os_url function to compose generic URL has been added. This
updates the URL generation to use that generic function.

Depends-on: https://review.opendev.org/877898
Change-Id: Id693ed077426c8e8c57130eb6d131b6a2407cdc3
---
 manifests/config.pp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/manifests/config.pp b/manifests/config.pp
index 0b720da81..e3ebd4e68 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -79,7 +79,16 @@ class openstack_integration::config (
   $base_url           = "${proto}://${ip_for_url}"
   $keystone_auth_uri  = "${base_url}:5000"
   $keystone_admin_uri = "${base_url}:5000"
-  $tooz_url           = "redis://:a_big_secret@${ip_for_url}:6379?ssl=${::openstack_integration::config::ssl}"
+
+  $tooz_url = os_url({
+    'scheme'   => 'redis',
+    'password' => 'a_big_secret',
+    'host'     => $ip_for_url,
+    'port'     => '6379',
+    'query'    => {
+      'ssl' => $ssl,
+    }
+  })
 
   $ovn_nb_connection = "${ovn_proto}:${ip_for_url}:6641"
   $ovn_sb_connection = "${ovn_proto}:${ip_for_url}:6642"