summaryrefslogtreecommitdiffstats
path: root/network/endpoints
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2016-05-19 00:13:11 +0200
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-05-30 10:22:59 +0300
commita6438a2082792e7528bfed682c64e352367f8f6f (patch)
treedb0e6236b5951618c20c8401bea2b7259ed2497d /network/endpoints
parent5090ae849b6300dba17fb55c250bc50825f7d21e (diff)
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>
Diffstat (limited to 'network/endpoints')
-rw-r--r--network/endpoints/endpoint_data.yaml4
-rw-r--r--network/endpoints/endpoint_map.yaml39
2 files changed, 42 insertions, 1 deletions
diff --git a/network/endpoints/endpoint_data.yaml b/network/endpoints/endpoint_data.yaml
index 40b26f26..c76e1360 100644
--- a/network/endpoints/endpoint_data.yaml
+++ b/network/endpoints/endpoint_data.yaml
@@ -61,8 +61,10 @@ GlanceRegistry:
port: 9191
Mysql:
- '':
+ Internal:
vip_param: Mysql
+ protocol: mysql+pymysql
+ port: 3306
Heat:
Internal:
diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml
index f4c17985..fbfa0a15 100644
--- a/network/endpoints/endpoint_map.yaml
+++ b/network/endpoints/endpoint_map.yaml
@@ -52,6 +52,7 @@ parameters:
KeystoneAdmin: {protocol: http, port: '35357', host: IP_ADDRESS}
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}
NeutronAdmin: {protocol: http, port: '9696', host: IP_ADDRESS}
NeutronInternal: {protocol: http, port: '9696', host: IP_ADDRESS}
NeutronPublic: {protocol: http, port: '9696', host: IP_ADDRESS}
@@ -1348,6 +1349,44 @@ outputs:
IP_ADDRESS: {get_param: PublicVirtualIP}
- ':'
- get_param: [EndpointMap, KeystonePublic, port]
+ MysqlInternal:
+ host:
+ str_replace:
+ template:
+ get_param: [EndpointMap, MysqlInternal, host]
+ params:
+ CLOUDNAME: {get_param: CloudName}
+ IP_ADDRESS: {get_param: MysqlVirtualIP}
+ port:
+ get_param: [EndpointMap, MysqlInternal, port]
+ protocol:
+ get_param: [EndpointMap, MysqlInternal, protocol]
+ uri:
+ list_join:
+ - ''
+ - - get_param: [EndpointMap, MysqlInternal, protocol]
+ - ://
+ - str_replace:
+ template:
+ get_param: [EndpointMap, MysqlInternal, host]
+ params:
+ CLOUDNAME: {get_param: CloudName}
+ IP_ADDRESS: {get_param: MysqlVirtualIP}
+ - ':'
+ - get_param: [EndpointMap, MysqlInternal, port]
+ uri_no_suffix:
+ list_join:
+ - ''
+ - - get_param: [EndpointMap, MysqlInternal, protocol]
+ - ://
+ - str_replace:
+ template:
+ get_param: [EndpointMap, MysqlInternal, host]
+ params:
+ CLOUDNAME: {get_param: CloudName}
+ IP_ADDRESS: {get_param: MysqlVirtualIP}
+ - ':'
+ - get_param: [EndpointMap, MysqlInternal, port]
NeutronAdmin:
host:
str_replace: