Merge "Allow vncproxy to work with ssl enabled"

diff --cc network/endpoints/endpoint_map.yaml
Simple merge

diff --cc puppet/compute.yaml
index 7586ebd,1f7f0c2..31d7626
--- 1/puppet/compute.yaml
--- 2/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}