summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Urdin <tobias.urdin@binero.se>2018-11-29 13:08:41 +0100
committerTobias Urdin <tobias.urdin@binero.se>2018-11-29 13:09:51 +0100
commitb84662d7ab7f8c0583a4ae6e48023a29ae549571 (patch)
tree327439fa168ef9f92487466651eb296f0e2c846d
parent0c4a5b581aaed019253e221200709575e39c3b99 (diff)
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
Notes
Notes (review): Code-Review+2: Emilien Macchi <emilien@redhat.com> Code-Review+2: zhongshengping <chdzsp@163.com> Workflow+1: zhongshengping <chdzsp@163.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 12 Dec 2018 04:02:41 +0000 Reviewed-on: https://review.openstack.org/620893 Project: openstack/puppet-heat Branch: refs/heads/master
-rw-r--r--manifests/init.pp24
-rw-r--r--releasenotes/notes/deprecate-client-keystone-auth-uri-4490508fd0673959.yaml5
-rw-r--r--spec/classes/heat_init_spec.rb9
3 files changed, 17 insertions, 21 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 39fc630..936bdc6 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -264,10 +264,6 @@
264# (optional) Heat url in format like http://0.0.0.0:8004/v1/%(tenant_id)s. 264# (optional) Heat url in format like http://0.0.0.0:8004/v1/%(tenant_id)s.
265# Defaults to $::os_service_default. 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# [*heat_clients_endpoint_type*] 267# [*heat_clients_endpoint_type*]
272# (optional) Type of endpoint in Identity service catalog to use for 268# (optional) Type of endpoint in Identity service catalog to use for
273# communication with the OpenStack service. 269# communication with the OpenStack service.
@@ -292,6 +288,12 @@
292# take for evaluation. 288# take for evaluation.
293# Defaults to $::os_service_default. 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#
295class heat( 297class heat(
296 $package_ensure = 'present', 298 $package_ensure = 'present',
297 $debug = undef, 299 $debug = undef,
@@ -351,12 +353,13 @@ class heat(
351 $notification_topics = $::os_service_default, 353 $notification_topics = $::os_service_default,
352 $enable_proxy_headers_parsing = $::os_service_default, 354 $enable_proxy_headers_parsing = $::os_service_default,
353 $heat_clients_url = $::os_service_default, 355 $heat_clients_url = $::os_service_default,
354 $heat_clients_keystone_uri = $::os_service_default,
355 $heat_clients_endpoint_type = $::os_service_default, 356 $heat_clients_endpoint_type = $::os_service_default,
356 $purge_config = false, 357 $purge_config = false,
357 $auth_strategy = 'keystone', 358 $auth_strategy = 'keystone',
358 $yaql_memory_quota = $::os_service_default, 359 $yaql_memory_quota = $::os_service_default,
359 $yaql_limit_iterators = $::os_service_default, 360 $yaql_limit_iterators = $::os_service_default,
361 ## DEPRECATED PARAMS
362 $heat_clients_keystone_uri = undef,
360) { 363) {
361 364
362 include ::heat::logging 365 include ::heat::logging
@@ -364,6 +367,10 @@ class heat(
364 include ::heat::deps 367 include ::heat::deps
365 include ::heat::params 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 if $auth_strategy == 'keystone' { 374 if $auth_strategy == 'keystone' {
368 include ::heat::keystone::authtoken 375 include ::heat::keystone::authtoken
369 } 376 }
@@ -418,12 +425,6 @@ class heat(
418 $keystone_password = $::heat::keystone::authtoken::password 425 $keystone_password = $::heat::keystone::authtoken::password
419 $keystone_project_domain_name = $::heat::keystone::authtoken::project_domain_name 426 $keystone_project_domain_name = $::heat::keystone::authtoken::project_domain_name
420 $keystone_user_domain_name = $::heat::keystone::authtoken::user_domain_name 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 heat_config { 429 heat_config {
429 'trustee/auth_type': value => 'password'; 430 'trustee/auth_type': value => 'password';
@@ -432,7 +433,6 @@ class heat(
432 'trustee/password': value => $keystone_password, secret => true; 433 'trustee/password': value => $keystone_password, secret => true;
433 'trustee/project_domain_name': value => $keystone_project_domain_name; 434 'trustee/project_domain_name': value => $keystone_project_domain_name;
434 'trustee/user_domain_name': value => $keystone_user_domain_name; 435 'trustee/user_domain_name': value => $keystone_user_domain_name;
435 'clients_keystone/auth_uri': value => $heat_clients_keystone_uri_real;
436 'clients_heat/url': value => $heat_clients_url; 436 'clients_heat/url': value => $heat_clients_url;
437 'clients/endpoint_type': value => $heat_clients_endpoint_type; 437 'clients/endpoint_type': value => $heat_clients_endpoint_type;
438 } 438 }
diff --git a/releasenotes/notes/deprecate-client-keystone-auth-uri-4490508fd0673959.yaml b/releasenotes/notes/deprecate-client-keystone-auth-uri-4490508fd0673959.yaml
new file mode 100644
index 0000000..2ec4c83
--- /dev/null
+++ b/releasenotes/notes/deprecate-client-keystone-auth-uri-4490508fd0673959.yaml
@@ -0,0 +1,5 @@
1---
2deprecations:
3 - |
4 The heat::heat_clients_keystone_uri parameter is deprecated, has no effect
5 and will be removed in a future release.
diff --git a/spec/classes/heat_init_spec.rb b/spec/classes/heat_init_spec.rb
index b00a920..1132186 100644
--- a/spec/classes/heat_init_spec.rb
+++ b/spec/classes/heat_init_spec.rb
@@ -120,10 +120,6 @@ describe 'heat' do
120 is_expected.to contain_heat_config('trustee/password').with_secret( true ) 120 is_expected.to contain_heat_config('trustee/password').with_secret( true )
121 end 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 it 'configures endpoint_type for clients' do 123 it 'configures endpoint_type for clients' do
128 is_expected.to contain_heat_config('clients/endpoint_type').with_value( '<SERVICE DEFAULT>' ) 124 is_expected.to contain_heat_config('clients/endpoint_type').with_value( '<SERVICE DEFAULT>' )
129 end 125 end
@@ -427,11 +423,6 @@ describe 'heat' do
427 end 423 end
428 end 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 on_supported_os({ 426 on_supported_os({
436 :supported_os => OSDefaults.get_supported_os 427 :supported_os => OSDefaults.get_supported_os
437 }).each do |os,facts| 428 }).each do |os,facts|