Add entry in serviceNetMap for Nova Placement
This is needed for t-h-t to autogenerate the hostnames and the vip entries in hiera. It also takes it into use in the endpoint map. Change-Id: Id0d34c7c3939ee81126ffd26d0658c0a87805a44
This commit is contained in:
parent
88e685984f
commit
c644d83d01
network
@ -202,7 +202,7 @@ Nova:
|
||||
|
||||
NovaPlacement:
|
||||
Internal:
|
||||
net_param: NovaApi
|
||||
net_param: NovaPlacement
|
||||
uri_suffixes:
|
||||
'': /placement
|
||||
Public:
|
||||
@ -210,7 +210,7 @@ NovaPlacement:
|
||||
uri_suffixes:
|
||||
'': /placement
|
||||
Admin:
|
||||
net_param: NovaApi
|
||||
net_param: NovaPlacement
|
||||
uri_suffixes:
|
||||
'': /placement
|
||||
port: 8778
|
||||
|
@ -5007,14 +5007,14 @@ outputs:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, NovaApiNetwork]
|
||||
- get_param: [ServiceNetMap, NovaPlacementNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- str_replace:
|
||||
params:
|
||||
NETWORK:
|
||||
get_param: [ServiceNetMap, NovaApiNetwork]
|
||||
get_param: [ServiceNetMap, NovaPlacementNetwork]
|
||||
template: NETWORK_uri
|
||||
host_nobrackets:
|
||||
str_replace:
|
||||
@ -5024,11 +5024,11 @@ outputs:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, NovaApiNetwork]
|
||||
- get_param: [ServiceNetMap, NovaPlacementNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- get_param: [ServiceNetMap, NovaApiNetwork]
|
||||
- get_param: [ServiceNetMap, NovaPlacementNetwork]
|
||||
port:
|
||||
get_param: [EndpointMap, NovaPlacementAdmin, port]
|
||||
protocol:
|
||||
@ -5045,14 +5045,14 @@ outputs:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, NovaApiNetwork]
|
||||
- get_param: [ServiceNetMap, NovaPlacementNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- str_replace:
|
||||
params:
|
||||
NETWORK:
|
||||
get_param: [ServiceNetMap, NovaApiNetwork]
|
||||
get_param: [ServiceNetMap, NovaPlacementNetwork]
|
||||
template: NETWORK_uri
|
||||
- ':'
|
||||
- get_param: [EndpointMap, NovaPlacementAdmin, port]
|
||||
@ -5069,18 +5069,17 @@ outputs:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, NovaApiNetwork]
|
||||
- get_param: [ServiceNetMap, NovaPlacementNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- str_replace:
|
||||
params:
|
||||
NETWORK:
|
||||
get_param: [ServiceNetMap, NovaApiNetwork]
|
||||
get_param: [ServiceNetMap, NovaPlacementNetwork]
|
||||
template: NETWORK_uri
|
||||
- ':'
|
||||
- get_param: [EndpointMap, NovaPlacementAdmin, port]
|
||||
- /placement
|
||||
NovaPlacementInternal:
|
||||
host:
|
||||
str_replace:
|
||||
@ -5090,14 +5089,14 @@ outputs:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, NovaApiNetwork]
|
||||
- get_param: [ServiceNetMap, NovaPlacementNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- str_replace:
|
||||
params:
|
||||
NETWORK:
|
||||
get_param: [ServiceNetMap, NovaApiNetwork]
|
||||
get_param: [ServiceNetMap, NovaPlacementNetwork]
|
||||
template: NETWORK_uri
|
||||
host_nobrackets:
|
||||
str_replace:
|
||||
@ -5107,11 +5106,11 @@ outputs:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, NovaApiNetwork]
|
||||
- get_param: [ServiceNetMap, NovaPlacementNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- get_param: [ServiceNetMap, NovaApiNetwork]
|
||||
- get_param: [ServiceNetMap, NovaPlacementNetwork]
|
||||
port:
|
||||
get_param: [EndpointMap, NovaPlacementInternal, port]
|
||||
protocol:
|
||||
@ -5128,14 +5127,14 @@ outputs:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, NovaApiNetwork]
|
||||
- get_param: [ServiceNetMap, NovaPlacementNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- str_replace:
|
||||
params:
|
||||
NETWORK:
|
||||
get_param: [ServiceNetMap, NovaApiNetwork]
|
||||
get_param: [ServiceNetMap, NovaPlacementNetwork]
|
||||
template: NETWORK_uri
|
||||
- ':'
|
||||
- get_param: [EndpointMap, NovaPlacementInternal, port]
|
||||
@ -5152,18 +5151,17 @@ outputs:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, NovaApiNetwork]
|
||||
- get_param: [ServiceNetMap, NovaPlacementNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- str_replace:
|
||||
params:
|
||||
NETWORK:
|
||||
get_param: [ServiceNetMap, NovaApiNetwork]
|
||||
get_param: [ServiceNetMap, NovaPlacementNetwork]
|
||||
template: NETWORK_uri
|
||||
- ':'
|
||||
- get_param: [EndpointMap, NovaPlacementInternal, port]
|
||||
- /placement
|
||||
NovaPlacementPublic:
|
||||
host:
|
||||
str_replace:
|
||||
@ -5240,13 +5238,12 @@ outputs:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- str_replace:
|
||||
params:
|
||||
params:
|
||||
NETWORK:
|
||||
get_param: [ServiceNetMap, PublicNetwork]
|
||||
template: NETWORK_uri
|
||||
template: NETWORK_uri
|
||||
- ':'
|
||||
- get_param: [EndpointMap, NovaPlacementPublic, port]
|
||||
- /placement
|
||||
NovaVNCProxyAdmin:
|
||||
host:
|
||||
str_replace:
|
||||
|
@ -42,6 +42,7 @@ parameters:
|
||||
HeatApiCfnNetwork: internal_api
|
||||
HeatApiCloudwatchNetwork: internal_api
|
||||
NovaApiNetwork: internal_api
|
||||
NovaPlacementNetwork: internal_api
|
||||
NovaMetadataNetwork: internal_api
|
||||
NovaVncProxyNetwork: internal_api
|
||||
SwiftStorageNetwork: storage_mgmt
|
||||
|
Loading…
x
Reference in New Issue
Block a user