From 7712ba32df6fe90095510fa4009b21b41d2a78d9 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Wed, 28 Dec 2016 14:18:19 +0800 Subject: [PATCH] Deprecate signing_dir option The signing_dir is deprecated for removel because of PKI token format is no longer supported. Update warning message and release note. Change-Id: I3fbbd11e42e0e4b1113da3ec1fdc651df0f60bde Closes-Bug: #1652700 --- manifests/init.pp | 15 +++++++++------ ...te_signing_dir_parameter-6135a343f233de98.yaml | 4 ++++ spec/classes/murano_init_spec.rb | 3 --- 3 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 releasenotes/notes/deprecate_signing_dir_parameter-6135a343f233de98.yaml diff --git a/manifests/init.pp b/manifests/init.pp index e53f48b..a3bfb4b 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -218,10 +218,6 @@ # undefined, tokens will instead be cached in-process. # Defaults to $::os_service_default. # -# [*signing_dir*] -# (Optional) Directory used to cache files related to PKI tokens -# Defaults to '/tmp/keystone-signing-muranoapi' -# # [*purge_config*] # (optional) Whether to set only the specified config options # in the murano config. @@ -257,6 +253,10 @@ # (optional) The RabbitMQ virtual host. # Defaults to $::os_service_default # +# [*signing_dir*] +# (Optional) Directory used to cache files related to PKI tokens. +# Defaults to undef +# class murano( $admin_password, $package_ensure = 'present', @@ -308,7 +308,6 @@ class murano( $admin_tenant_name = 'services', $auth_uri = 'http://127.0.0.1:5000', $memcached_servers = $::os_service_default, - $signing_dir = '/tmp/keystone-signing-muranoapi', $purge_config = false, # Deprecated $identity_uri = 'http://127.0.0.1:35357/', @@ -318,6 +317,7 @@ class murano( $rabbit_os_virtual_host = $::os_service_default, $rabbit_os_user = 'guest', $rabbit_os_password = 'guest', + $signing_dir = undef, ) { include ::murano::deps @@ -339,6 +339,10 @@ murano::rabbit_os_port, murano::rabbit_os_userid and murano::rabbit_os_virtual_h deprecated. Please use murano::default_transport_url instead.") } + if $signing_dir { + warning('signing_dir parameter is deprecated, has no effect and will be removed in the P release.') + } + package { 'murano-common': ensure => $package_ensure, name => $::murano::params::common_package_name, @@ -404,7 +408,6 @@ deprecated. Please use murano::default_transport_url instead.") 'keystone_authtoken/auth_uri' : value => $auth_uri; 'keystone_authtoken/admin_user' : value => $admin_user; 'keystone_authtoken/admin_tenant_name' : value => $admin_tenant_name; - 'keystone_authtoken/signing_dir' : value => $signing_dir; 'keystone_authtoken/admin_password' : value => $admin_password; 'keystone_authtoken/identity_uri' : value => $identity_uri; 'keystone_authtoken/memcached_servers': value => join(any2array($memcached_servers), ','); diff --git a/releasenotes/notes/deprecate_signing_dir_parameter-6135a343f233de98.yaml b/releasenotes/notes/deprecate_signing_dir_parameter-6135a343f233de98.yaml new file mode 100644 index 0000000..9c3ade9 --- /dev/null +++ b/releasenotes/notes/deprecate_signing_dir_parameter-6135a343f233de98.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - signing_dir option is now deprecated for removal, the + parameter has no effect. diff --git a/spec/classes/murano_init_spec.rb b/spec/classes/murano_init_spec.rb index b024e5f..12bf0be 100644 --- a/spec/classes/murano_init_spec.rb +++ b/spec/classes/murano_init_spec.rb @@ -63,7 +63,6 @@ describe 'murano' do it { is_expected.to contain_murano_config('keystone_authtoken/auth_uri').with_value('http://127.0.0.1:5000') } it { is_expected.to contain_murano_config('keystone_authtoken/admin_user').with_value('murano') } it { is_expected.to contain_murano_config('keystone_authtoken/admin_tenant_name').with_value('services') } - it { is_expected.to contain_murano_config('keystone_authtoken/signing_dir').with_value('/tmp/keystone-signing-muranoapi') } it { is_expected.to contain_murano_config('keystone_authtoken/admin_password').with_value('secrete') } it { is_expected.not_to contain_murano_config('keystone_authtoken/identity_uri').with_value('http://10.255.0.1:35357/') } it { is_expected.to contain_murano_config('keystone_authtoken/memcached_servers').with_value('') } @@ -108,7 +107,6 @@ describe 'murano' do :admin_tenant_name => 'secrete', :auth_uri => 'http://10.255.0.1:5000/v2.0/', :identity_uri => 'http://10.255.0.1:35357/', - :signing_dir => '/tmp/keystone-muranoapi', :kombu_reconnect_delay => '1.0', :kombu_failover_strategy => 'round-robin', :kombu_compression => 'gzip', @@ -154,7 +152,6 @@ describe 'murano' do it { is_expected.to contain_murano_config('keystone_authtoken/auth_uri').with_value('http://10.255.0.1:5000/v2.0/') } it { is_expected.to contain_murano_config('keystone_authtoken/admin_user').with_value('muranoy') } it { is_expected.to contain_murano_config('keystone_authtoken/admin_tenant_name').with_value('secrete') } - it { is_expected.to contain_murano_config('keystone_authtoken/signing_dir').with_value('/tmp/keystone-muranoapi') } it { is_expected.to contain_murano_config('keystone_authtoken/identity_uri').with_value('http://10.255.0.1:35357/') } it { is_expected.to contain_murano_config('keystone_authtoken/admin_password').with_value('secrete') } it { is_expected.to contain_murano_config('keystone_authtoken/memcached_servers').with_value('1.1.1.1:11211') }