Merge "No longer escape IPv6 ip addresses"
This commit is contained in:
commit
02ab90f67d
|
@ -453,10 +453,9 @@ class glance::api(
|
||||||
'glance_store/os_region_name': value => $os_region_name;
|
'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
|
# configure api service to connect registry service
|
||||||
glance_api_config {
|
glance_api_config {
|
||||||
'DEFAULT/registry_host': value => $registry_host_real;
|
'DEFAULT/registry_host': value => $registry_host;
|
||||||
'DEFAULT/registry_port': value => $registry_port;
|
'DEFAULT/registry_port': value => $registry_port;
|
||||||
'DEFAULT/registry_client_protocol': value => $registry_client_protocol;
|
'DEFAULT/registry_client_protocol': value => $registry_client_protocol;
|
||||||
}
|
}
|
||||||
|
|
|
@ -371,17 +371,6 @@ describe 'glance::api' do
|
||||||
|
|
||||||
end
|
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
|
describe 'while validating the service with custom command' do
|
||||||
let :params do
|
let :params do
|
||||||
default_params.merge({
|
default_params.merge({
|
||||||
|
|
Loading…
Reference in New Issue