Merge "Supports IPv6 in vnc proxy."

manifests/vncproxy/common.pp

@@ -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,

spec/classes/nova_vnc_proxy_spec.rb

@@ -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