openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Add IronicInspector settings to the network map"

This commit is contained in:
Jenkins 2017-05-20 00:18:51 +00:00 committed by Gerrit Code Review
parent fcafc264a5 e61f76bae7
commit cbd528f411
6 changed files with 265 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
environments/tls-endpoints-public-dns.yaml
View File

@ -72,6 +72,9 @@ parameter_defaults:
IronicAdmin: {protocol: 'http', port: '6385', host: 'IP_ADDRESS'}
IronicInternal: {protocol: 'http', port: '6385', host: 'IP_ADDRESS'}
IronicPublic: {protocol: 'https', port: '13385', host: 'CLOUDNAME'}
IronicInspectorAdmin: {protocol: 'http', port: '5050', host: 'IP_ADDRESS'}
IronicInspectorInternal: {protocol: 'http', port: '5050', host: 'IP_ADDRESS'}
IronicInspectorPublic: {protocol: 'https', port: '13050', host: 'CLOUDNAME'}
KeystoneAdmin: {protocol: 'http', port: '35357', host: 'IP_ADDRESS'}
KeystoneInternal: {protocol: 'http', port: '5000', host: 'IP_ADDRESS'}
KeystonePublic: {protocol: 'https', port: '13000', host: 'CLOUDNAME'}

3
environments/tls-endpoints-public-ip.yaml
View File

@ -72,6 +72,9 @@ parameter_defaults:
IronicAdmin: {protocol: 'http', port: '6385', host: 'IP_ADDRESS'}
IronicInternal: {protocol: 'http', port: '6385', host: 'IP_ADDRESS'}
IronicPublic: {protocol: 'https', port: '13385', host: 'IP_ADDRESS'}
IronicInspectorAdmin: {protocol: 'http', port: '5050', host: 'IP_ADDRESS'}
IronicInspectorInternal: {protocol: 'http', port: '5050', host: 'IP_ADDRESS'}
IronicInspectorPublic: {protocol: 'https', port: '13050', host: 'IP_ADDRESS'}
KeystoneAdmin: {protocol: 'http', port: '35357', host: 'IP_ADDRESS'}
KeystoneInternal: {protocol: 'http', port: '5000', host: 'IP_ADDRESS'}
KeystonePublic: {protocol: 'https', port: '13000', host: 'IP_ADDRESS'}

3
environments/tls-everywhere-endpoints-dns.yaml
View File

@ -72,6 +72,9 @@ parameter_defaults:
IronicAdmin: {protocol: 'https', port: '6385', host: 'CLOUDNAME'}
IronicInternal: {protocol: 'https', port: '6385', host: 'CLOUDNAME'}
IronicPublic: {protocol: 'https', port: '13385', host: 'CLOUDNAME'}
IronicInspectorAdmin: {protocol: 'http', port: '5050', host: 'CLOUDNAME'}
IronicInspectorInternal: {protocol: 'http', port: '5050', host: 'CLOUDNAME'}
IronicInspectorPublic: {protocol: 'https', port: '13050', host: 'CLOUDNAME'}
KeystoneAdmin: {protocol: 'https', port: '35357', host: 'CLOUDNAME'}
KeystoneInternal: {protocol: 'https', port: '5000', host: 'CLOUDNAME'}
KeystonePublic: {protocol: 'https', port: '13000', host: 'CLOUDNAME'}

9
network/endpoints/endpoint_data.yaml
View File

@ -394,6 +394,15 @@ Ironic:
'': /v1
port: 6385
IronicInspector:
Internal:
net_param: IronicInspector
Public:
net_param: Public
Admin:
net_param: IronicInspector
port: 5050
Zaqar:
Internal:
net_param: ZaqarApi

246
network/endpoints/endpoint_map.yaml
View File

@ -89,6 +89,9 @@ parameters:
IronicAdmin: {protocol: http, port: '6385', host: IP_ADDRESS}
IronicInternal: {protocol: http, port: '6385', host: IP_ADDRESS}
IronicPublic: {protocol: http, port: '6385', host: IP_ADDRESS}
IronicInspectorAdmin: {protocol: http, port: '5050', host: IP_ADDRESS}
IronicInspectorInternal: {protocol: http, port: '5050', host: IP_ADDRESS}
IronicInspectorPublic: {protocol: http, port: '5050', host: IP_ADDRESS}
KeystoneAdmin: {protocol: http, port: '35357', host: IP_ADDRESS}
KeystoneInternal: {protocol: http, port: '5000', host: IP_ADDRESS}
KeystonePublic: {protocol: http, port: '5000', host: IP_ADDRESS}
@ -5930,6 +5933,249 @@ outputs:
template: NETWORK_uri
- ':'
- get_param: [EndpointMap, IronicPublic, port]
IronicInspectorAdmin:
host:
str_replace:
template:
get_param: [EndpointMap, IronicInspectorAdmin, host]
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, IronicInspectorNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param: [ServiceNetMap, IronicInspectorNetwork]
template: NETWORK_uri
host_nobrackets:
str_replace:
template:
get_param: [EndpointMap, IronicInspectorAdmin, host]
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, IronicInspectorNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- get_param: [ServiceNetMap, IronicInspectorNetwork]
port:
get_param: [EndpointMap, IronicInspectorAdmin, port]
protocol:
get_param: [EndpointMap, IronicInspectorAdmin, protocol]
uri:
list_join:
- ''
- - get_param: [EndpointMap, IronicInspectorAdmin, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, IronicInspectorAdmin, host]
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, IronicInspectorNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param: [ServiceNetMap, IronicInspectorNetwork]
template: NETWORK_uri
- ':'
- get_param: [EndpointMap, IronicInspectorAdmin, port]
uri_no_suffix:
list_join:
- ''
- - get_param: [EndpointMap, IronicInspectorAdmin, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, IronicInspectorAdmin, host]
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, IronicInspectorNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param: [ServiceNetMap, IronicInspectorNetwork]
template: NETWORK_uri
- ':'
- get_param: [EndpointMap, IronicInspectorAdmin, port]
IronicInspectorInternal:
host:
str_replace:
template:
get_param: [EndpointMap, IronicInspectorInternal, host]
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, IronicInspectorNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param: [ServiceNetMap, IronicInspectorNetwork]
template: NETWORK_uri
host_nobrackets:
str_replace:
template:
get_param: [EndpointMap, IronicInspectorInternal, host]
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, IronicInspectorNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- get_param: [ServiceNetMap, IronicInspectorNetwork]
port:
get_param: [EndpointMap, IronicInspectorInternal, port]
protocol:
get_param: [EndpointMap, IronicInspectorInternal, protocol]
uri:
list_join:
- ''
- - get_param: [EndpointMap, IronicInspectorInternal, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, IronicInspectorInternal, host]
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, IronicInspectorNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param: [ServiceNetMap, IronicInspectorNetwork]
template: NETWORK_uri
- ':'
- get_param: [EndpointMap, IronicInspectorInternal, port]
uri_no_suffix:
list_join:
- ''
- - get_param: [EndpointMap, IronicInspectorInternal, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, IronicInspectorInternal, host]
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, IronicInspectorNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param: [ServiceNetMap, IronicInspectorNetwork]
template: NETWORK_uri
- ':'
- get_param: [EndpointMap, IronicInspectorInternal, port]
IronicInspectorPublic:
host:
str_replace:
template:
get_param: [EndpointMap, IronicInspectorPublic, host]
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, PublicNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param: [ServiceNetMap, PublicNetwork]
template: NETWORK_uri
host_nobrackets:
str_replace:
template:
get_param: [EndpointMap, IronicInspectorPublic, host]
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, PublicNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- get_param: [ServiceNetMap, PublicNetwork]
port:
get_param: [EndpointMap, IronicInspectorPublic, port]
protocol:
get_param: [EndpointMap, IronicInspectorPublic, protocol]
uri:
list_join:
- ''
- - get_param: [EndpointMap, IronicInspectorPublic, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, IronicInspectorPublic, host]
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, PublicNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param: [ServiceNetMap, PublicNetwork]
template: NETWORK_uri
- ':'
- get_param: [EndpointMap, IronicInspectorPublic, port]
uri_no_suffix:
list_join:
- ''
- - get_param: [EndpointMap, IronicInspectorPublic, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, IronicInspectorPublic, host]
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param: [ServiceNetMap, PublicNetwork]
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param: [ServiceNetMap, PublicNetwork]
template: NETWORK_uri
- ':'
- get_param: [EndpointMap, IronicInspectorPublic, port]
KeystoneAdmin:
host:
str_replace:

1
network/service_net_map.j2.yaml
View File

@ -45,6 +45,7 @@ parameters:
GlanceApiNetwork: storage
IronicApiNetwork: ctlplane
IronicNetwork: ctlplane
IronicInspectorNetwork: ctlplane
KeystoneAdminApiNetwork: ctlplane # allows undercloud to config endpoints
KeystonePublicApiNetwork: internal_api
ManilaApiNetwork: internal_api