x/packstack
Code Issues Proposed changes

Remove usage of deprecated auth_uri in swift proxy

Browse Source 
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
This commit is contained in:
yatinkarel
2020-05-04 16:25:52 +05:30
parent 4f58975d6c
commit 7cdf7bc511
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packstack/puppet/modules/packstack/manifests/swift/ceilometer.pp
View File

@@ -11,7 +11,6 @@ class packstack::swift::ceilometer ()
control_exchange => 'swift', control_exchange => 'swift',
driver => 'messaging', driver => 'messaging',
ignore_projects => ['service'], ignore_projects => ['service'],
auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'), auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
password => hiera('CONFIG_SWIFT_KS_PW'), password => hiera('CONFIG_SWIFT_KS_PW'),
} }

10
packstack/puppet/modules/packstack/manifests/swift/proxy.pp
View File

@@ -93,12 +93,12 @@ class packstack::swift::proxy ()
} }
class { '::swift::proxy::authtoken': class { '::swift::proxy::authtoken':
username => 'swift', username => 'swift',
project_name => 'services', project_name => 'services',
password => hiera('CONFIG_SWIFT_KS_PW'), password => hiera('CONFIG_SWIFT_KS_PW'),
# assume that the controller host is the swift api server # assume that the controller host is the swift api server
auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'), www_authenticate_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'), auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
} }
class { '::swift::objectexpirer': } class { '::swift::objectexpirer': }