diff options
author | 2016-03-10 21:15:50 +0000 | |
---|---|---|
committer | 2016-03-10 21:15:51 +0000 | |
commit | 164fcec5b5f1893d67111099125fe05b3d712623 (patch) | |
tree | 79db0717ec163917ee4785e367dd6461b5b79a32 /puppet/compute.yaml | |
parent | d7bda879e747b8713114755f9a06ed887a59cfe9 (diff) | |
parent | dfb70bd5b3d133a614193e42d04a7a69b0bb821b (diff) |
Merge "Fix vncproxy_host for IPv6"
Diffstat (limited to 'puppet/compute.yaml')
-rw-r--r-- | puppet/compute.yaml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/puppet/compute.yaml b/puppet/compute.yaml index cd756837..b1804cf6 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -576,7 +576,14 @@ resources: cinder_enable_rbd_backend: {get_param: CinderEnableRbdBackend} nova_vnc_proxyclient_address: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NovaVncProxyNetwork]}]} nova_vncproxy_protocol: {get_param: [EndpointMap, NovaVNCProxyPublic, protocol]} - nova_vncproxy_host: {get_param: [EndpointMap, NovaVNCProxyPublic, host]} + # Remove brackets that may come if the IP address is IPv6. + # For DNS names and IPv4, this will just get the NovaVNCProxyPublic value + nova_vncproxy_host: + str_replace: + template: {get_param: [EndpointMap, NovaVNCProxyPublic, host]} + params: + '[': '' + ']': '' nova_vncproxy_port: {get_param: [EndpointMap, NovaVNCProxyPublic, port]} nova_ovs_bridge: {get_param: NovaOVSBridge} nova_security_group_api: {get_param: NovaSecurityGroupAPI} |