openstack
/
puppet-glance
Code Issues Proposed changes

Merge "No longer escape IPv6 ip addresses"

This commit is contained in:
Jenkins 2017-08-23 21:12:33 +00:00 committed by Gerrit Code Review
parent 93b158e656 500f5cb73a
commit 02ab90f67d
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({