aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-19 15:57:19 +0000
committerGerrit Code Review <review@openstack.org>2016-09-19 15:57:19 +0000
commitf6ffad6515beb264d88006a1695651af12978bbe (patch)
tree64624ae89cc24735d1c5c1fe3a0c9b9e4b7a0f1f /puppet
parent2f664a113a45219883c79019953aaed62858664c (diff)
parent67ae241b7e7bde5f473e891e13050b92a55ccd5d (diff)
Merge "Set VNC URL parameters for nova-compute"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/nova-compute.yaml3
1 files changed, 3 insertions, 0 deletions
diff --git a/puppet/services/nova-compute.yaml b/puppet/services/nova-compute.yaml
index c9a95346..f7f2510e 100644
--- a/puppet/services/nova-compute.yaml
+++ b/puppet/services/nova-compute.yaml
@@ -137,6 +137,9 @@ outputs:
# internal_api_subnet - > IP/CIDR
nova::compute::vncserver_proxyclient_address: {get_param: [ServiceNetMap, NovaVncProxyNetwork]}
nova::compute::vncproxy_host: {get_param: [EndpointMap, NovaPublic, host_nobrackets]}
+ nova::vncproxy::common::vncproxy_protocol: {get_param: [EndpointMap, NovaVNCProxyPublic, protocol]}
+ nova::vncproxy::common::vncproxy_host: {get_param: [EndpointMap, NovaVNCProxyPublic, host_nobrackets]}
+ nova::vncproxy::common::vncproxy_port: {get_param: [EndpointMap, NovaVNCProxyPublic, port]}
step_config: |
# TODO(emilien): figure how to deal with libvirt profile.
# We'll probably treat it like we do with Neutron plugins.