From a6438a2082792e7528bfed682c64e352367f8f6f Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente@redhat.com>
Date: Thu, 19 May 2016 00:13:11 +0200
Subject: Pass MysqlVirtualIP via EndpointMap

By passing the MysqlVirtualIP via the EndpointMap we won't need it
to be provided as a parameter to the services.

This follows what is already happening for the glance registry
service with I9186e56cd4746a60e65dc5ac12e6595ac56505f0.

Change-Id: Iad2ab389bf64d0fc8b06eb0e7d29b5370ff27dff
Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com>
---
 puppet/controller.yaml | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

(limited to 'puppet/controller.yaml')

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 3aa0df14..703ff265 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -596,9 +596,6 @@ parameters:
   MysqlVirtualIP:
     type: string
     default: ''
-  MysqlVirtualIPUri:
-    type: string
-    default: ''
   NeutronApiVirtualIP:
     type: string
     default: ''
@@ -856,10 +853,11 @@ resources:
         cinder_dsn:
           list_join:
             - ''
-            - - 'mysql+pymysql://cinder:'
+            - - {get_param: [EndpointMap, MysqlInternal, protocol]}
+              - '://cinder:'
               - {get_param: CinderPassword}
               - '@'
-              - {get_param: MysqlVirtualIPUri}
+              - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/cinder'
         cinder_public_url: {get_param: [EndpointMap, CinderPublic, uri]}
         cinder_internal_url: {get_param: [EndpointMap, CinderInternal, uri]}
@@ -962,10 +960,11 @@ resources:
         neutron_dsn:
           list_join:
             - ''
-            - - 'mysql+pymysql://neutron:'
+            - - {get_param: [EndpointMap, MysqlInternal, protocol]}
+              - '://neutron:'
               - {get_param: NeutronPassword}
               - '@'
-              - {get_param: MysqlVirtualIPUri}
+              - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/ovs_neutron?charset=utf8'
         neutron_internal_url: { get_param: [ EndpointMap, NeutronInternal, uri ] }
         neutron_public_url: { get_param: [ EndpointMap, NeutronPublic, uri ] }
@@ -995,18 +994,20 @@ resources:
         ceilometer_dsn:
           list_join:
             - ''
-            - - 'mysql+pymysql://ceilometer:'
+            - - {get_param: [EndpointMap, MysqlInternal, protocol]}
+              - '://ceilometer:'
               - {get_param: CeilometerPassword}
               - '@'
-              - {get_param: MysqlVirtualIPUri}
+              - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/ceilometer'
         gnocchi_dsn:
           list_join:
             - ''
-            - - 'mysql+pymysql://gnocchi:'
+            - - {get_param: [EndpointMap, MysqlInternal, protocol]}
+              - '://gnocchi:'
               - {get_param: GnocchiPassword}
               - '@'
-              - {get_param: MysqlVirtualIPUri}
+              - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/gnocchi'
         gnocchi_internal_url: {get_param: [EndpointMap, GnocchiInternal, uri]}
         gnocchi_public_url: { get_param: [ EndpointMap, GnocchiPublic, uri ] }
@@ -1024,18 +1025,20 @@ resources:
         nova_dsn:
           list_join:
             - ''
-            - - 'mysql+pymysql://nova:'
+            - - {get_param: [EndpointMap, MysqlInternal, protocol]}
+              - '://nova:'
               - {get_param: NovaPassword}
               - '@'
-              - {get_param: MysqlVirtualIPUri}
+              - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/nova'
         nova_api_dsn:
           list_join:
             - ''
-            - - 'mysql+pymysql://nova_api:'
+            - - {get_param: [EndpointMap, MysqlInternal, protocol]}
+              - '://nova_api:'
               - {get_param: NovaPassword}
               - '@'
-              - {get_param: MysqlVirtualIPUri}
+              - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/nova_api'
         upgrade_level_nova_compute: {get_param: UpgradeLevelNovaCompute}
         instance_name_template: {get_param: InstanceNameTemplate}
@@ -1077,10 +1080,11 @@ resources:
         sahara_dsn:
           list_join:
             - ''
-            - - 'mysql://sahara:'
+            - - {get_param: [EndpointMap, MysqlInternal, protocol]}
+              - '://sahara:'
               - {get_param: SaharaPassword}
               - '@'
-              - {get_param: MysqlVirtualIPUri}
+              - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/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