From e61f76bae738a1cc11edfb967d3ec4602cb40a2e Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Mon, 20 Feb 2017 14:29:02 -0500 Subject: Add IronicInspector settings to the network map This will allow us to support adding ironic inspector services in follow up patches. Change-Id: I5e743f789ab7dd731bc7ad26226a92a4e71f95a1 --- environments/tls-endpoints-public-dns.yaml | 3 + environments/tls-endpoints-public-ip.yaml | 3 + environments/tls-everywhere-endpoints-dns.yaml | 3 + network/endpoints/endpoint_data.yaml | 9 + network/endpoints/endpoint_map.yaml | 246 +++++++++++++++++++++++++ network/service_net_map.j2.yaml | 1 + 6 files changed, 265 insertions(+) diff --git a/environments/tls-endpoints-public-dns.yaml b/environments/tls-endpoints-public-dns.yaml index 1b666c5b..44432210 100644 --- a/environments/tls-endpoints-public-dns.yaml +++ b/environments/tls-endpoints-public-dns.yaml @@ -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'} diff --git a/environments/tls-endpoints-public-ip.yaml b/environments/tls-endpoints-public-ip.yaml index 7311a1f9..5ac2918b 100644 --- a/environments/tls-endpoints-public-ip.yaml +++ b/environments/tls-endpoints-public-ip.yaml @@ -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'} diff --git a/environments/tls-everywhere-endpoints-dns.yaml b/environments/tls-everywhere-endpoints-dns.yaml index e6608b57..865ed4c3 100644 --- a/environments/tls-everywhere-endpoints-dns.yaml +++ b/environments/tls-everywhere-endpoints-dns.yaml @@ -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'} diff --git a/network/endpoints/endpoint_data.yaml b/network/endpoints/endpoint_data.yaml index c92ce377..f5f2b97e 100644 --- a/network/endpoints/endpoint_data.yaml +++ b/network/endpoints/endpoint_data.yaml @@ -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 diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml index b4fcbb17..f0c41a81 100644 --- a/network/endpoints/endpoint_map.yaml +++ b/network/endpoints/endpoint_map.yaml @@ -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: diff --git a/network/service_net_map.j2.yaml b/network/service_net_map.j2.yaml index 7fb9420c..fb57c66c 100644 --- a/network/service_net_map.j2.yaml +++ b/network/service_net_map.j2.yaml @@ -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 -- cgit 1.2.3-korg