From 1cc63d5e3d4557d5ce3bdc9dfb7b87b7726198b4 Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente@redhat.com>
Date: Sat, 5 Mar 2016 01:09:38 +0100
Subject: Use MysqlVirtualIPUri for nova_api and sahara database

Without this the nova_api and sahara database_connection string won't
add brackets around the IP address, when IPv6, causing db sync to fail.

Change-Id: I262e5de993ae59ad665edb043119aac2e09c6fdc
---
 puppet/controller.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'puppet')

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 733a9d72..6e4f92cc 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -1173,7 +1173,7 @@ resources:
             - - 'mysql+pymysql://nova_api:'
               - {get_param: NovaPassword}
               - '@'
-              - {get_param: MysqlVirtualIP}
+              - {get_param: MysqlVirtualIPUri}
               - '/nova_api'
         upgrade_level_nova_compute: {get_param: UpgradeLevelNovaCompute}
         instance_name_template: {get_param: InstanceNameTemplate}
@@ -1213,7 +1213,7 @@ resources:
             - - 'mysql://sahara:'
               - {get_param: SaharaPassword}
               - '@'
-              - {get_param: MysqlVirtualIP}
+              - {get_param: MysqlVirtualIPUri}
               - '/sahara'
         swift_proxy_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftProxyNetwork]}]}
         swift_management_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftMgmtNetwork]}]}
-- 
cgit 1.2.3-korg