De-bracket vncproxy_host in compute profile
This is done in the vncproxy profile, but for some reason is not in the compute one. It causes hiera to explode when the brackets are left, so we need to do the bracket stripping here too. Also switches both places to just use the host_nobrackets version of the endpoint instead of stripping them with str_replace. Change-Id: I7ccd84b575fd652f6412fdb1869c31c79a7bf53b Closes-Bug: 1618623
This commit is contained in:
parent
ede33f67b9
commit
57898b4162
puppet/services
@ -128,7 +128,7 @@ outputs:
|
||||
# internal_api_uri -> [IP]
|
||||
# internal_api_subnet - > IP/CIDR
|
||||
nova::compute::vncserver_proxyclient_address: {get_param: [ServiceNetMap, NovaVncProxyNetwork]}
|
||||
nova::compute::vncproxy_host: {get_param: [EndpointMap, NovaPublic, host]}
|
||||
nova::compute::vncproxy_host: {get_param: [EndpointMap, NovaPublic, host_nobrackets]}
|
||||
step_config: |
|
||||
# TODO(emilien): figure how to deal with libvirt profile.
|
||||
# We'll probably treat it like we do with Neutron plugins.
|
||||
|
@ -41,14 +41,7 @@ outputs:
|
||||
- get_attr: [NovaBase, role_data, config_settings]
|
||||
- nova::vncproxy::enabled: true
|
||||
nova::vncproxy::common::vncproxy_protocol: {get_param: [EndpointMap, NovaVNCProxyPublic, protocol]}
|
||||
# Remove brackets that may come if the IP address is IPv6.
|
||||
# For DNS names and IPv4, this will just get NovaVNCProxyPublic
|
||||
nova::vncproxy::common::vncproxy_host:
|
||||
str_replace:
|
||||
template: {get_param: [EndpointMap, NovaVNCProxyPublic, host]}
|
||||
params:
|
||||
'[': ''
|
||||
']': ''
|
||||
nova::vncproxy::common::vncproxy_host: {get_param: [EndpointMap, NovaVNCProxyPublic, host_nobrackets]}
|
||||
nova::vncproxy::common::vncproxy_port: {get_param: [EndpointMap, NovaVNCProxyPublic, port]}
|
||||
# NOTE: bind IP is found in Heat replacing the network name with the local node IP
|
||||
# for the given network; replacement examples (eg. for internal_api):
|
||||
|
Loading…
x
Reference in New Issue
Block a user