Browse Source

Deprecate heat_clients_keystone_uri

The heat_clients_keystone_uri parameter sets the
[clients_keystone]/auth_uri option which does not
exist anymore, see [1].

[1] https://docs.openstack.org/heat/latest/configuration/sample_config.html

Change-Id: I8cf34475aa0868da800bc5f37d20341f755b38a2
tags/14.2.0
Tobias Urdin 5 months ago
parent
commit
b84662d7ab

+ 12
- 12
manifests/init.pp View File

@@ -264,10 +264,6 @@
264 264
 #   (optional) Heat url in format like http://0.0.0.0:8004/v1/%(tenant_id)s.
265 265
 #   Defaults to $::os_service_default.
266 266
 #
267
-# [*heat_clients_keystone_uri*]
268
-#   (optional) Heat clients auth url in format like http://127.0.0.1:5000/.
269
-#   Defaults to $::os_service_default.
270
-#
271 267
 # [*heat_clients_endpoint_type*]
272 268
 #   (optional) Type of endpoint in Identity service catalog to use for
273 269
 #   communication with the OpenStack service.
@@ -292,6 +288,12 @@
292 288
 #     take for evaluation.
293 289
 #   Defaults to $::os_service_default.
294 290
 #
291
+## DEPRECATED PARAMS
292
+#
293
+# [*heat_clients_keystone_uri*]
294
+#   (optional) Heat clients auth url in format like http://127.0.0.1:5000/.
295
+#   Defaults to undef.
296
+#
295 297
 class heat(
296 298
   $package_ensure                     = 'present',
297 299
   $debug                              = undef,
@@ -351,12 +353,13 @@ class heat(
351 353
   $notification_topics                = $::os_service_default,
352 354
   $enable_proxy_headers_parsing       = $::os_service_default,
353 355
   $heat_clients_url                   = $::os_service_default,
354
-  $heat_clients_keystone_uri          = $::os_service_default,
355 356
   $heat_clients_endpoint_type         = $::os_service_default,
356 357
   $purge_config                       = false,
357 358
   $auth_strategy                      = 'keystone',
358 359
   $yaql_memory_quota                  = $::os_service_default,
359 360
   $yaql_limit_iterators               = $::os_service_default,
361
+  ## DEPRECATED PARAMS
362
+  $heat_clients_keystone_uri          = undef,
360 363
 ) {
361 364
 
362 365
   include ::heat::logging
@@ -364,6 +367,10 @@ class heat(
364 367
   include ::heat::deps
365 368
   include ::heat::params
366 369
 
370
+  if $heat_clients_keystone_uri {
371
+    warning('heat_clients_keystone_ur is deprecated, has no effect and will be removed in the future')
372
+  }
373
+
367 374
   if $auth_strategy == 'keystone' {
368 375
     include ::heat::keystone::authtoken
369 376
   }
@@ -418,12 +425,6 @@ class heat(
418 425
   $keystone_password = $::heat::keystone::authtoken::password
419 426
   $keystone_project_domain_name = $::heat::keystone::authtoken::project_domain_name
420 427
   $keystone_user_domain_name = $::heat::keystone::authtoken::user_domain_name
421
-  if (defined($heat_clients_keystone_uri)) {
422
-    $heat_clients_keystone_uri_real = $heat_clients_keystone_uri
423
-  } else {
424
-    $heat_clients_keystone_uri_real = $www_authenticate_uri
425
-  }
426
-
427 428
 
428 429
   heat_config {
429 430
     'trustee/auth_type':           value => 'password';
@@ -432,7 +433,6 @@ class heat(
432 433
     'trustee/password':            value => $keystone_password, secret => true;
433 434
     'trustee/project_domain_name': value => $keystone_project_domain_name;
434 435
     'trustee/user_domain_name':    value => $keystone_user_domain_name;
435
-    'clients_keystone/auth_uri':   value => $heat_clients_keystone_uri_real;
436 436
     'clients_heat/url':            value => $heat_clients_url;
437 437
     'clients/endpoint_type':       value => $heat_clients_endpoint_type;
438 438
   }

+ 5
- 0
releasenotes/notes/deprecate-client-keystone-auth-uri-4490508fd0673959.yaml View File

@@ -0,0 +1,5 @@
1
+---
2
+deprecations:
3
+  - |
4
+    The heat::heat_clients_keystone_uri parameter is deprecated, has no effect
5
+    and will be removed in a future release.

+ 0
- 9
spec/classes/heat_init_spec.rb View File

@@ -120,10 +120,6 @@ describe 'heat' do
120 120
       is_expected.to contain_heat_config('trustee/password').with_secret( true )
121 121
     end
122 122
 
123
-    it 'configures auth_uri for clients_keystone' do
124
-      is_expected.to contain_heat_config('clients_keystone/auth_uri').with_value( 'http://127.0.0.1:5000/' )
125
-    end
126
-
127 123
     it 'configures endpoint_type for clients' do
128 124
       is_expected.to contain_heat_config('clients/endpoint_type').with_value( '<SERVICE DEFAULT>' )
129 125
     end
@@ -427,11 +423,6 @@ describe 'heat' do
427 423
     end
428 424
   end
429 425
 
430
-  shared_examples_for "with custom heat_clients_keystone_uri" do
431
-      before { params.merge!( :heat_clients_keystone_uri => 'https://domain1/' ) }
432
-      it { is_expected.to contain_heat_config('clients_keystone/auth_uri').with_value('https://domain1/') }
433
-  end
434
-
435 426
   on_supported_os({
436 427
     :supported_os   => OSDefaults.get_supported_os
437 428
   }).each do |os,facts|

Loading…
Cancel
Save