openstack
/
puppet-glance
Code Issues Proposed changes

No longer escape IPv6 ip addresses 

This reverts commit 624f522e71.

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
This commit is contained in:
Derek Higgins 2017-08-17 17:07:28 +01:00
parent 851ee9d6e1
commit 500f5cb73a
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/api.pp
View File

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

11
spec/classes/glance_api_spec.rb
View File

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