openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "De-bracket vncproxy_host in compute profile"

This commit is contained in:
Jenkins 2016-09-12 22:13:19 +00:00 committed by Gerrit Code Review
parent 5281bfbac8 57898b4162
commit 6dbcec15d3
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/services/nova-compute.yaml
View File

@ -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.

9
puppet/services/nova-vnc-proxy.yaml
View File

@ -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):