From 2b662be9a458d71101a1ba4c6a3b45c9cebdd272 Mon Sep 17 00:00:00 2001 From: Jose Luis Franco Arza Date: Wed, 4 Apr 2018 16:02:01 +0200 Subject: [PATCH] Add www_authenticate_uri option to replace auth_uri. auth_uri option has been depreacted in favor of www_authenticate_uri from group keystone_authtoken in puppet-keystone [0] and keystonemiddleware [1]. This patch adds the new option keeping auth_uri references in the templates until the replace will be updated in all puppet packages. [0] https://review.openstack.org/#/c/558344/ [1] https://review.openstack.org/#/c/508522/ Closes-Bug: #1761171 Change-Id: I804ec73b970844d245dbb0911710ec817359beb0 --- puppet/services/aodh-base.yaml | 1 + puppet/services/barbican-api.yaml | 1 + puppet/services/ceilometer-base.yaml | 1 + puppet/services/cinder-api.yaml | 3 ++- puppet/services/congress.yaml | 1 + puppet/services/ec2-api.yaml | 1 + puppet/services/gnocchi-api.yaml | 1 + puppet/services/heat-base.yaml | 1 + puppet/services/manila-share.yaml | 1 + puppet/services/mistral-base.yaml | 1 + puppet/services/neutron-api.yaml | 1 + puppet/services/nova-api.yaml | 1 + puppet/services/nova-placement.yaml | 1 + puppet/services/octavia-api.yaml | 3 ++- puppet/services/panko-base.yaml | 1 + puppet/services/sahara-base.yaml | 1 + puppet/services/tacker.yaml | 1 + puppet/services/zaqar-api.yaml | 1 + .../notes/deprecate_auth_uri_parameter-bdebdc6614ce8b7e.yaml | 4 ++++ 19 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/deprecate_auth_uri_parameter-bdebdc6614ce8b7e.yaml diff --git a/puppet/services/aodh-base.yaml b/puppet/services/aodh-base.yaml index b613dee7e3..845754e9ae 100644 --- a/puppet/services/aodh-base.yaml +++ b/puppet/services/aodh-base.yaml @@ -112,6 +112,7 @@ outputs: aodh::keystone::authtoken::user_domain_name: 'Default' aodh::keystone::authtoken::project_domain_name: 'Default' aodh::keystone::authtoken::password: {get_param: AodhPassword} + aodh::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } aodh::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } aodh::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } aodh::auth::auth_password: {get_param: AodhPassword} diff --git a/puppet/services/barbican-api.yaml b/puppet/services/barbican-api.yaml index 59f64b43d5..6244194227 100644 --- a/puppet/services/barbican-api.yaml +++ b/puppet/services/barbican-api.yaml @@ -110,6 +110,7 @@ outputs: map_merge: - get_attr: [ApacheServiceBase, role_data, config_settings] - barbican::keystone::authtoken::password: {get_param: BarbicanPassword} + barbican::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} barbican::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} barbican::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} barbican::keystone::authtoken::project_name: 'service' diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml index 57439c2904..0a4f6f359f 100644 --- a/puppet/services/ceilometer-base.yaml +++ b/puppet/services/ceilometer-base.yaml @@ -154,6 +154,7 @@ outputs: ceilometer::keystone::authtoken::user_domain_name: 'Default' ceilometer::keystone::authtoken::project_domain_name: 'Default' ceilometer::keystone::authtoken::password: {get_param: CeilometerPassword} + ceilometer::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } ceilometer::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } ceilometer::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } ceilometer::agent::auth::auth_password: {get_param: CeilometerPassword} diff --git a/puppet/services/cinder-api.yaml b/puppet/services/cinder-api.yaml index 1af3496237..698d6c1e79 100644 --- a/puppet/services/cinder-api.yaml +++ b/puppet/services/cinder-api.yaml @@ -107,7 +107,8 @@ outputs: map_merge: - get_attr: [CinderBase, role_data, config_settings] - get_attr: [ApacheServiceBase, role_data, config_settings] - - cinder::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} + - cinder::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} + cinder::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} cinder::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} cinder::keystone::authtoken::password: {get_param: CinderPassword} cinder::keystone::authtoken::project_name: 'service' diff --git a/puppet/services/congress.yaml b/puppet/services/congress.yaml index f8b8bec852..d3960f4351 100644 --- a/puppet/services/congress.yaml +++ b/puppet/services/congress.yaml @@ -122,6 +122,7 @@ outputs: congress::keystone::authtoken::user_domain_name: 'Default' congress::keystone::authtoken::project_domain_name: 'Default' congress::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} + congress::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} congress::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} congress::db::mysql::password: {get_param: CongressPassword} diff --git a/puppet/services/ec2-api.yaml b/puppet/services/ec2-api.yaml index 1fb5896fdd..2e90155794 100644 --- a/puppet/services/ec2-api.yaml +++ b/puppet/services/ec2-api.yaml @@ -106,6 +106,7 @@ outputs: - 13788 ec2api::keystone::authtoken::project_name: 'service' ec2api::keystone::authtoken::password: {get_param: Ec2ApiPassword} + ec2api::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri] } ec2api::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] } ec2api::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} ec2api::policy::policies: {get_param: Ec2ApiPolicies} diff --git a/puppet/services/gnocchi-api.yaml b/puppet/services/gnocchi-api.yaml index d3eacaf3cc..157ae5c4d5 100644 --- a/puppet/services/gnocchi-api.yaml +++ b/puppet/services/gnocchi-api.yaml @@ -109,6 +109,7 @@ outputs: gnocchi::api::enable_proxy_headers_parsing: true gnocchi::api::service_name: 'httpd' gnocchi::policy::policies: {get_param: GnocchiApiPolicies} + gnocchi::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} gnocchi::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} gnocchi::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} gnocchi::keystone::authtoken::password: {get_param: GnocchiPassword} diff --git a/puppet/services/heat-base.yaml b/puppet/services/heat-base.yaml index d65ac04da8..70c5a71789 100644 --- a/puppet/services/heat-base.yaml +++ b/puppet/services/heat-base.yaml @@ -165,6 +165,7 @@ outputs: heat::keystone::authtoken::project_name: 'service' heat::keystone::authtoken::user_domain_name: 'Default' heat::keystone::authtoken::project_domain_name: 'Default' + heat::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } heat::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } heat::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } heat::keystone::authtoken::password: {get_param: HeatPassword} diff --git a/puppet/services/manila-share.yaml b/puppet/services/manila-share.yaml index b8f69c1808..fb05dacc60 100644 --- a/puppet/services/manila-share.yaml +++ b/puppet/services/manila-share.yaml @@ -60,6 +60,7 @@ outputs: - get_attr: [ManilaBase, role_data, config_settings] - manila::volume::cinder::cinder_admin_tenant_name: 'service' manila::keystone::authtoken::password: {get_param: ManilaPassword} + manila::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} manila::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} manila::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } manila::keystone::authtoken::project_name: 'service' diff --git a/puppet/services/mistral-base.yaml b/puppet/services/mistral-base.yaml index fd346fdc1c..9ae0ba34a0 100644 --- a/puppet/services/mistral-base.yaml +++ b/puppet/services/mistral-base.yaml @@ -108,6 +108,7 @@ outputs: mistral::keystone::authtoken::user_domain_name: 'Default' mistral::keystone::authtoken::project_domain_name: 'Default' mistral::keystone::authtoken::password: {get_param: MistralPassword} + mistral::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneV3Internal, uri]} mistral::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneV3Internal, uri]} mistral::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} mistral::keystone_ec2_uri: diff --git a/puppet/services/neutron-api.yaml b/puppet/services/neutron-api.yaml index ddd414249f..3d4fcbe995 100644 --- a/puppet/services/neutron-api.yaml +++ b/puppet/services/neutron-api.yaml @@ -158,6 +158,7 @@ outputs: read_default_file: /etc/my.cnf.d/tripleo.cnf read_default_group: tripleo neutron::policy::policies: {get_param: NeutronApiPolicies} + neutron::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } neutron::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } neutron::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} neutron::server::allow_automatic_l3agent_failover: {get_param: NeutronAllowL3AgentFailover} diff --git a/puppet/services/nova-api.yaml b/puppet/services/nova-api.yaml index 65ed64360c..69eef0c722 100644 --- a/puppet/services/nova-api.yaml +++ b/puppet/services/nova-api.yaml @@ -132,6 +132,7 @@ outputs: nova::keystone::authtoken::user_domain_name: 'Default' nova::keystone::authtoken::project_domain_name: 'Default' nova::keystone::authtoken::password: {get_param: NovaPassword} + nova::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } nova::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } nova::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} nova::api::enabled: true diff --git a/puppet/services/nova-placement.yaml b/puppet/services/nova-placement.yaml index 920bf0ab31..a44e7bf2f2 100644 --- a/puppet/services/nova-placement.yaml +++ b/puppet/services/nova-placement.yaml @@ -96,6 +96,7 @@ outputs: - 13778 nova::keystone::authtoken::project_name: 'service' nova::keystone::authtoken::password: {get_param: NovaPassword} + nova::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } nova::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } nova::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]} nova::wsgi::apache_placement::api_port: '8778' diff --git a/puppet/services/octavia-api.yaml b/puppet/services/octavia-api.yaml index d034e79897..21705faf74 100644 --- a/puppet/services/octavia-api.yaml +++ b/puppet/services/octavia-api.yaml @@ -74,7 +74,8 @@ outputs: config_settings: map_merge: - get_attr: [OctaviaBase, role_data, config_settings] - - octavia::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] } + - octavia::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri] } + octavia::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] } octavia::policy::policies: {get_param: OctaviaApiPolicies} octavia::db::database_connection: make_url: diff --git a/puppet/services/panko-base.yaml b/puppet/services/panko-base.yaml index 86b0bfb49b..5584310caf 100644 --- a/puppet/services/panko-base.yaml +++ b/puppet/services/panko-base.yaml @@ -108,6 +108,7 @@ outputs: panko::keystone::authtoken::user_domain_name: 'Default' panko::keystone::authtoken::project_domain_name: 'Default' panko::keystone::authtoken::password: {get_param: PankoPassword} + panko::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } panko::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } panko::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } panko::auth::auth_password: {get_param: PankoPassword} diff --git a/puppet/services/sahara-base.yaml b/puppet/services/sahara-base.yaml index ca7362c94e..530a9f1464 100644 --- a/puppet/services/sahara-base.yaml +++ b/puppet/services/sahara-base.yaml @@ -109,6 +109,7 @@ outputs: sahara::rpc_backend: rabbit sahara::db::database_db_max_retries: -1 sahara::db::database_max_retries: -1 + sahara::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} sahara::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} sahara::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} sahara::keystone::authtoken::password: {get_param: SaharaPassword} diff --git a/puppet/services/tacker.yaml b/puppet/services/tacker.yaml index ecc2b09cc1..98e169a4c2 100644 --- a/puppet/services/tacker.yaml +++ b/puppet/services/tacker.yaml @@ -123,6 +123,7 @@ outputs: tacker::keystone::authtoken::project_domain_name: 'Default' tacker::keystone::authtoken::password: {get_param: TackerPassword} tacker::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} + tacker::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} tacker::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} tacker::db::mysql::password: {get_param: TackerPassword} diff --git a/puppet/services/zaqar-api.yaml b/puppet/services/zaqar-api.yaml index b379fa2ed7..2a3599f27f 100644 --- a/puppet/services/zaqar-api.yaml +++ b/puppet/services/zaqar-api.yaml @@ -104,6 +104,7 @@ outputs: zaqar::keystone::authtoken::password: {get_param: ZaqarPassword} zaqar::keystone::authtoken::project_name: 'service' zaqar::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} + zaqar::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} zaqar::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} zaqar::keystone::trust::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} zaqar::debug: diff --git a/releasenotes/notes/deprecate_auth_uri_parameter-bdebdc6614ce8b7e.yaml b/releasenotes/notes/deprecate_auth_uri_parameter-bdebdc6614ce8b7e.yaml new file mode 100644 index 0000000000..6001b1c2c5 --- /dev/null +++ b/releasenotes/notes/deprecate_auth_uri_parameter-bdebdc6614ce8b7e.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - auth_uri is depreacted and will be removed in a future release. + Please, use www_authenticate_uri instead.