diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-02-24 09:32:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-02-24 09:32:47 +0000 |
| commit | 949b6d1cc247a66869c627a504436f1642481667 (patch) | |
| tree | fff84f9edc4556d62434e18d254920a5951c7848 /puppet | |
| parent | ef73827d736124bf609b0c06ee6d0d05353bd596 (diff) | |
| parent | dd7602ad82100617126be26d80a6d3f67cb739ac (diff) | |
Merge "Allow vncproxy to work with ssl enabled"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/compute.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/compute.yaml b/puppet/compute.yaml index 7586ebd0..31d76263 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -475,6 +475,9 @@ resources: 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} @@ -547,6 +550,9 @@ resources: nova_enable_rbd_backend: {get_param: NovaEnableRbdBackend} 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]} + nova_vncproxy_port: {get_param: [EndpointMap, NovaVNCProxyPublic, port]} nova_ovs_bridge: {get_param: NovaOVSBridge} nova_security_group_api: {get_param: NovaSecurityGroupAPI} ceilometer_metering_secret: {get_param: CeilometerMeteringSecret} |