Pass MysqlVirtualIP without brackets to EndpointMap

While the endpoints do need brackets around IPv6 addresses these
are not wanted by some of the puppet classes so we must pass the
non bracketed version as well.

It will allow us to remove the need for the MysqlVirtualIP param
passed to the controller role thouh when hieradata/database.yaml
is emptied.

Change-Id: If264b02a134b96368035f032e05d02e84f6499ed

3 files changed, 48 insertions, 0 deletions

diff --git a/network/endpoints/endpoint_data.yaml b/network/endpoints/endpoint_data.yaml
index 53b474de..f1dee045 100644
--- a/network/endpoints/endpoint_data.yaml
+++ b/network/endpoints/endpoint_data.yaml
@@ -66,6 +66,12 @@ Mysql:
     protocol: mysql+pymysql
     port: 3306
 
+MysqlNoBrackets:
+    Internal:
+        vip_param: MysqlNoBrackets
+    protocol: mysql+pymysql
+    port: 3306
+
 Heat:
     Internal:
         vip_param: HeatApi
diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml
index 51ff375b..43b9921e 100644
--- a/network/endpoints/endpoint_map.yaml
+++ b/network/endpoints/endpoint_map.yaml
@@ -18,6 +18,7 @@ parameters:
   IronicApiVirtualIP: {type: string, default: ''}
   KeystoneAdminApiVirtualIP: {type: string, default: ''}
   KeystonePublicApiVirtualIP: {type: string, default: ''}
+  MysqlNoBracketsVirtualIP: {type: string, default: ''}
   MysqlVirtualIP: {type: string, default: ''}
   NeutronApiVirtualIP: {type: string, default: ''}
   NovaApiVirtualIP: {type: string, default: ''}
@@ -57,6 +58,8 @@ parameters:
       KeystoneInternal: {protocol: http, port: '5000', host: IP_ADDRESS}
       KeystonePublic: {protocol: http, port: '5000', host: IP_ADDRESS}
       MysqlInternal: {protocol: mysql+pymysql, port: '3306', host: IP_ADDRESS}
+      MysqlNoBracketsInternal: {protocol: mysql+pymysql, port: '3306',
+        host: IP_ADDRESS}
       NeutronAdmin: {protocol: http, port: '9696', host: IP_ADDRESS}
       NeutronInternal: {protocol: http, port: '9696', host: IP_ADDRESS}
       NeutronPublic: {protocol: http, port: '9696', host: IP_ADDRESS}
@@ -1508,6 +1511,44 @@ outputs:
                   IP_ADDRESS: {get_param: MysqlVirtualIP}
             - ':'
             - get_param: [EndpointMap, MysqlInternal, port]
+      MysqlNoBracketsInternal:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, MysqlNoBracketsInternal, host]
+            params:
+              CLOUDNAME: {get_param: CloudName}
+              IP_ADDRESS: {get_param: MysqlNoBracketsVirtualIP}
+        port:
+          get_param: [EndpointMap, MysqlNoBracketsInternal, port]
+        protocol:
+          get_param: [EndpointMap, MysqlNoBracketsInternal, protocol]
+        uri:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, MysqlNoBracketsInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, MysqlNoBracketsInternal, host]
+                params:
+                  CLOUDNAME: {get_param: CloudName}
+                  IP_ADDRESS: {get_param: MysqlNoBracketsVirtualIP}
+            - ':'
+            - get_param: [EndpointMap, MysqlNoBracketsInternal, port]
+        uri_no_suffix:
+          list_join:
+          - ''
+          - - get_param: [EndpointMap, MysqlNoBracketsInternal, protocol]
+            - ://
+            - str_replace:
+                template:
+                  get_param: [EndpointMap, MysqlNoBracketsInternal, host]
+                params:
+                  CLOUDNAME: {get_param: CloudName}
+                  IP_ADDRESS: {get_param: MysqlNoBracketsVirtualIP}
+            - ':'
+            - get_param: [EndpointMap, MysqlNoBracketsInternal, port]
       NeutronAdmin:
         host:
           str_replace:
diff --git a/overcloud.yaml b/overcloud.yaml
index 11ea1bdb..845b990e 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -770,6 +770,7 @@ resources:
       KeystoneAdminApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}]}
       KeystonePublicApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}]}
       MysqlVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, MysqlNetwork]}]}
+      MysqlNoBracketsVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, MysqlNetwork]}]}
       NeutronApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, NeutronApiNetwork]}]}
       NovaApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, NovaApiNetwork]}]}
       SaharaApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, SaharaApiNetwork]}]}