openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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
This commit is contained in:
Giulio Fidente 2016-07-07 12:12:56 +02:00
parent f91f08a528
commit cf42408582
3 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
network/endpoints/endpoint_data.yaml
View File

@ -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

41
network/endpoints/endpoint_map.yaml
View File

@ -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:

1
overcloud.yaml
View File

@ -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]}]}