Browse Source

Merge "No longer escape IPv6 ip addresses"

tags/11.3.0^0
Jenkins 1 year ago
parent
commit
02ab90f67d
2 changed files with 1 additions and 13 deletions
  1. 1
    2
      manifests/api.pp
  2. 0
    11
      spec/classes/glance_api_spec.rb

+ 1
- 2
manifests/api.pp View File

@@ -453,10 +453,9 @@ class glance::api(
453 453
     'glance_store/os_region_name':    value => $os_region_name;
454 454
   }
455 455
 
456
-  $registry_host_real = normalize_ip_for_uri($registry_host)
457 456
   # configure api service to connect registry service
458 457
   glance_api_config {
459
-    'DEFAULT/registry_host':            value => $registry_host_real;
458
+    'DEFAULT/registry_host':            value => $registry_host;
460 459
     'DEFAULT/registry_port':            value => $registry_port;
461 460
     'DEFAULT/registry_client_protocol': value => $registry_client_protocol;
462 461
   }

+ 0
- 11
spec/classes/glance_api_spec.rb View File

@@ -371,17 +371,6 @@ describe 'glance::api' do
371 371
 
372 372
     end
373 373
 
374
-    describe 'Support IPv6' do
375
-      let :params do
376
-        default_params.merge({
377
-          :registry_host => '2001::1',
378
-        })
379
-      end
380
-      it { is_expected.to contain_glance_api_config('DEFAULT/registry_host').with(
381
-        :value => '[2001::1]'
382
-      )}
383
-    end
384
-
385 374
     describe 'while validating the service with custom command' do
386 375
       let :params do
387 376
         default_params.merge({

Loading…
Cancel
Save