From 7cdf7bc511e47c0e3249894d02c0658a9358f720 Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Mon, 4 May 2020 16:25:52 +0530 Subject: [PATCH] Remove usage of deprecated auth_uri in swift proxy auth_uri param is removed in favor of www_authenticate_uri in [1], this patch switch to it in swift proxy authtoken. Also remove usage of deprecated param 'auth_uri' in swift::proxy::ceilometer as its not used[2]. [1] https://review.opendev.org/#/c/725119/ [2] https://review.opendev.org/#/c/707748/ Change-Id: I76dbf86f37a2d2ac12b45d8a455fded5865b33e9 --- .../modules/packstack/manifests/swift/ceilometer.pp | 1 - .../puppet/modules/packstack/manifests/swift/proxy.pp | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/packstack/puppet/modules/packstack/manifests/swift/ceilometer.pp b/packstack/puppet/modules/packstack/manifests/swift/ceilometer.pp index d38735f35..328d15a18 100644 --- a/packstack/puppet/modules/packstack/manifests/swift/ceilometer.pp +++ b/packstack/puppet/modules/packstack/manifests/swift/ceilometer.pp @@ -11,7 +11,6 @@ class packstack::swift::ceilometer () control_exchange => 'swift', driver => 'messaging', ignore_projects => ['service'], - auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'), auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'), password => hiera('CONFIG_SWIFT_KS_PW'), } diff --git a/packstack/puppet/modules/packstack/manifests/swift/proxy.pp b/packstack/puppet/modules/packstack/manifests/swift/proxy.pp index ec24f7f2e..cde8a973d 100644 --- a/packstack/puppet/modules/packstack/manifests/swift/proxy.pp +++ b/packstack/puppet/modules/packstack/manifests/swift/proxy.pp @@ -93,12 +93,12 @@ class packstack::swift::proxy () } class { '::swift::proxy::authtoken': - username => 'swift', - project_name => 'services', - password => hiera('CONFIG_SWIFT_KS_PW'), + username => 'swift', + project_name => 'services', + password => hiera('CONFIG_SWIFT_KS_PW'), # assume that the controller host is the swift api server - auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'), - auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'), + www_authenticate_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'), + auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'), } class { '::swift::objectexpirer': }