stackforge/puppet-openstack-cloud
Code Issues Proposed changes

spice: fix URL

Browse Source 
Replace internal URL by public URL

Close #235

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi 2014-02-12 21:51:01 +01:00
parent ff91033e5e
commit ec7a659a31
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/compute/hypervisor.pp
View File

@ -29,8 +29,8 @@
class cloud::compute::hypervisor( class cloud::compute::hypervisor(
$server_proxyclient_address = $os_params::internal_netif_ip, $server_proxyclient_address = $os_params::internal_netif_ip,
$libvirt_type = $os_params::libvirt_type, $libvirt_type = $os_params::libvirt_type,
$ks_nova_internal_proto = $os_params::ks_nova_internal_proto, $ks_nova_public_proto = $os_params::ks_nova_public_proto,
$ks_nova_internal_host = $os_params::ks_nova_internal_host, $ks_nova_public_host = $os_params::ks_nova_public_host,
$nova_ssh_private_key = $os_params::nova_ssh_private_key, $nova_ssh_private_key = $os_params::nova_ssh_private_key,
$nova_ssh_public_key = $os_params::nova_ssh_public_key, $nova_ssh_public_key = $os_params::nova_ssh_public_key,
$spice_port = $os_params::spice_port, $spice_port = $os_params::spice_port,
@ -94,8 +94,8 @@ Host *
class { 'nova::compute::spice': class { 'nova::compute::spice':
server_listen => '0.0.0.0', server_listen => '0.0.0.0',
server_proxyclient_address => $server_proxyclient_address, server_proxyclient_address => $server_proxyclient_address,
proxy_host => $ks_nova_internal_host, proxy_host => $ks_nova_public_host,
proxy_protocol => $ks_nova_internal_proto, proxy_protocol => $ks_nova_public_proto,
proxy_port => $spice_port proxy_port => $spice_port
} }

4
spec/classes/cloud_compute_hypervisor_spec.rb
View File

@ -51,8 +51,8 @@ describe 'cloud::compute::hypervisor' do
:rbd_secret_uuid => 'secrete', :rbd_secret_uuid => 'secrete',
:nova_ssh_private_key => 'secrete', :nova_ssh_private_key => 'secrete',
:nova_ssh_public_key => 'public', :nova_ssh_public_key => 'public',
:ks_nova_internal_proto => 'http', :ks_nova_public_proto => 'http',
:ks_nova_internal_host => '10.0.0.1' } :ks_nova_public_host => '10.0.0.1' }
end end
it 'configure nova common' do it 'configure nova common' do