Supports IPv6 in vnc proxy.
This patch add support for IPv6 address in vnc proxy url. It adds brackets if an IPv6 is detected. Change-Id: I12fb8f01b5bdca2bfea856c8a5e158fa1d87a15b Related-Bug: 1531960 Depends-On: I093dd5a4e6294e20761cb3d33373652eeadeac36
This commit is contained in:
parent
cdebe16ead
commit
9eafb7d859
|
@ -25,11 +25,11 @@ class nova::vncproxy::common (
|
|||
|
||||
include ::nova::deps
|
||||
|
||||
$vncproxy_host_real = pick(
|
||||
$vncproxy_host_real = normalize_ip_for_uri(pick(
|
||||
$vncproxy_host,
|
||||
$::nova::compute::vncproxy_host,
|
||||
$::nova::vncproxy::host,
|
||||
false)
|
||||
false))
|
||||
$vncproxy_protocol_real = pick(
|
||||
$vncproxy_protocol,
|
||||
$::nova::compute::vncproxy_protocol,
|
||||
|
|
|
@ -105,4 +105,10 @@ describe 'nova::vncproxy' do
|
|||
|
||||
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
|
||||
|
|
Loading…
Reference in New Issue