From ec7a659a31b3b5262243bff05fffbe710664bc0c Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 12 Feb 2014 21:51:01 +0100 Subject: [PATCH] spice: fix URL Replace internal URL by public URL Close #235 Signed-off-by: Emilien Macchi --- manifests/compute/hypervisor.pp | 8 ++++---- spec/classes/cloud_compute_hypervisor_spec.rb | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/manifests/compute/hypervisor.pp b/manifests/compute/hypervisor.pp index 1fe9d11d..da228024 100644 --- a/manifests/compute/hypervisor.pp +++ b/manifests/compute/hypervisor.pp @@ -29,8 +29,8 @@ class cloud::compute::hypervisor( $server_proxyclient_address = $os_params::internal_netif_ip, $libvirt_type = $os_params::libvirt_type, - $ks_nova_internal_proto = $os_params::ks_nova_internal_proto, - $ks_nova_internal_host = $os_params::ks_nova_internal_host, + $ks_nova_public_proto = $os_params::ks_nova_public_proto, + $ks_nova_public_host = $os_params::ks_nova_public_host, $nova_ssh_private_key = $os_params::nova_ssh_private_key, $nova_ssh_public_key = $os_params::nova_ssh_public_key, $spice_port = $os_params::spice_port, @@ -94,8 +94,8 @@ Host * class { 'nova::compute::spice': server_listen => '0.0.0.0', server_proxyclient_address => $server_proxyclient_address, - proxy_host => $ks_nova_internal_host, - proxy_protocol => $ks_nova_internal_proto, + proxy_host => $ks_nova_public_host, + proxy_protocol => $ks_nova_public_proto, proxy_port => $spice_port } diff --git a/spec/classes/cloud_compute_hypervisor_spec.rb b/spec/classes/cloud_compute_hypervisor_spec.rb index 5a0045d1..0a6d74ac 100644 --- a/spec/classes/cloud_compute_hypervisor_spec.rb +++ b/spec/classes/cloud_compute_hypervisor_spec.rb @@ -51,8 +51,8 @@ describe 'cloud::compute::hypervisor' do :rbd_secret_uuid => 'secrete', :nova_ssh_private_key => 'secrete', :nova_ssh_public_key => 'public', - :ks_nova_internal_proto => 'http', - :ks_nova_internal_host => '10.0.0.1' } + :ks_nova_public_proto => 'http', + :ks_nova_public_host => '10.0.0.1' } end it 'configure nova common' do