From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 24 Feb 2016 09:32:46 +0000 (+0000)
Subject: Merge "Allow vncproxy to work with ssl enabled"
X-Git-Tag: opnfv-6.0.0~2171
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=949b6d1cc247a66869c627a504436f1642481667;p=apex-tripleo-heat-templates.git

Merge "Allow vncproxy to work with ssl enabled"
---

949b6d1cc247a66869c627a504436f1642481667
diff --cc puppet/compute.yaml
index 7586ebd0,1f7f0c23..31d76263
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@@ -473,8 -462,10 +473,11 @@@ resources
                  nova::compute::rbd::ephemeral_storage: {get_input: nova_enable_rbd_backend}
                  rbd_persistent_storage: {get_input: cinder_enable_rbd_backend}
                  nova_password: {get_input: nova_password}
 +                nova::compute::network_device_mtu: {get_input: neutron_tenant_mtu}
                  nova::compute::vncserver_proxyclient_address: {get_input: nova_vnc_proxyclient_address}
+                 nova::vncproxy::common::vncproxy_protocol: {get_input: nova_vncproxy_protocol}
+                 nova::vncproxy::common::vncproxy_host: {get_input: nova_vncproxy_host}
+                 nova::vncproxy::common::vncproxy_port: {get_input: nova_vncproxy_port}
                  nova::network::neutron::neutron_ovs_bridge: {get_input: nova_ovs_bridge}
                  nova::network::neutron::security_group_api: {get_input: nova_security_group_api}
                  ceilometer::debug: {get_input: debug}