From 624f522e7156bcdd103a19177be4881e12ff9d49 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Mon, 29 Feb 2016 12:55:22 -0500
Subject: [PATCH] Supports IPv6 in registry_host

This patch add support for IPv6 address in registry_host.
It adds brackets if an IPv6 is detected.

Change-Id: Ic1d75984fac7bce3d0239df54a877ae2b713c442
---
 manifests/api.pp                |  3 ++-
 spec/classes/glance_api_spec.rb | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/manifests/api.pp b/manifests/api.pp
index f80e7bc7..29835123 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -354,9 +354,10 @@ class glance::api(
     'glance_store/os_region_name':    value => $os_region_name;
   }
 
+  $registry_host_real = normalize_ip_for_uri($registry_host)
   # configure api service to connect registry service
   glance_api_config {
-    'DEFAULT/registry_host':            value => $registry_host;
+    'DEFAULT/registry_host':            value => $registry_host_real;
     'DEFAULT/registry_port':            value => $registry_port;
     'DEFAULT/registry_client_protocol': value => $registry_client_protocol;
   }
diff --git a/spec/classes/glance_api_spec.rb b/spec/classes/glance_api_spec.rb
index a84dbf96..428ebee4 100644
--- a/spec/classes/glance_api_spec.rb
+++ b/spec/classes/glance_api_spec.rb
@@ -307,6 +307,17 @@ describe 'glance::api' do
     )}
   end
 
+  describe 'Support IPv6' do
+    let :params do
+      default_params.merge({
+        :registry_host => '2001::1',
+      })
+    end
+    it { is_expected.to contain_glance_api_config('DEFAULT/registry_host').with(
+      :value => '[2001::1]'
+    )}
+  end
+
   describe 'on Debian platforms' do
     let :facts do
       @default_facts.merge({