openstack/puppet-nova
Code Issues Proposed changes

Merge "Supports IPv6 in vnc proxy."

Browse Source
This commit is contained in:
Jenkins
2016-02-17 13:41:39 +00:00
committed by Gerrit Code Review
parent 605a9d90e2 9eafb7d859
commit e0e1f617be
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/vncproxy/common.pp
View File

@@ -25,11 +25,11 @@ class nova::vncproxy::common (
include ::nova::deps include ::nova::deps
$vncproxy_host_real = pick( $vncproxy_host_real = normalize_ip_for_uri(pick(
$vncproxy_host, $vncproxy_host,
$::nova::compute::vncproxy_host, $::nova::compute::vncproxy_host,
$::nova::vncproxy::host, $::nova::vncproxy::host,
false) false))
$vncproxy_protocol_real = pick( $vncproxy_protocol_real = pick(
$vncproxy_protocol, $vncproxy_protocol,
$::nova::compute::vncproxy_protocol, $::nova::compute::vncproxy_protocol,

6
spec/classes/nova_vnc_proxy_spec.rb
View File

@@ -105,4 +105,10 @@ describe 'nova::vncproxy' do
end end
describe 'Support IPv6' do
let(:facts) { @default_facts.merge({ :osfamily => 'Debian'}) }
let(:params) { { :host => '2001::1' } }
it { is_expected.to contain_nova_config('vnc/novncproxy_base_url').with(:value => 'http://[2001::1]:6080/vnc_auto.html') }
end
end end