From 500f5cb73a564da1675222a823b975077eec262b Mon Sep 17 00:00:00 2001
From: Derek Higgins <derekh@redhat.com>
Date: Thu, 17 Aug 2017 17:07:28 +0100
Subject: [PATCH] No longer escape IPv6 ip addresses

This reverts commit 624f522e7156bcdd103a19177be4881e12ff9d49.

As of I06e8cff035ecfaa651e215d7b18de5abc3a273c3 "registry_host" is now
using the OSLO opt type of HostAddressOpt. This type does now allow
square brackets.

Change-Id: Iedb38f63c045b1ac1dfadd68db63c47b1a0536da
Closes-Bug: #1711404
---
 manifests/api.pp                |  3 +--
 spec/classes/glance_api_spec.rb | 11 -----------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/manifests/api.pp b/manifests/api.pp
index 777aeefb..7e5d3f0a 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -453,10 +453,9 @@ 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_real;
+    'DEFAULT/registry_host':            value => $registry_host;
     '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 b57e741e..9606b1d5 100644
--- a/spec/classes/glance_api_spec.rb
+++ b/spec/classes/glance_api_spec.rb
@@ -371,17 +371,6 @@ 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 'while validating the service with custom command' do
       let :params do
         default_params.merge({