openstack/puppet-swift
Code Issues Proposed changes

Remove tenant parameter from keystone_user

Browse Source 
Puppet-swift to match recent update in keystone module.
The tenant parameter was made deprecated in Kilo and to be removed in Liberty.
Removing the tenant parmamter from keystone_user in dispersion.pp

Change-Id: Ie86497f462e2a94819b8dbd1e4131890858af266
This commit is contained in:
Adam Vinsh
2015-11-03 15:32:15 -05:00
parent 31ab888be2
commit 0a16263636
2 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/keystone/dispersion.pp
View File

@@ -40,7 +40,6 @@ class swift::keystone::dispersion(
ensure => present, ensure => present,
password => $auth_pass, password => $auth_pass,
email => $email, email => $email,
tenant => $tenant,
} }
keystone_user_role { "${auth_user}@${tenant}": keystone_user_role { "${auth_user}@${tenant}":

2
spec/classes/swift_keystone_dispersion_spec.rb
View File

@@ -8,7 +8,6 @@ describe 'swift::keystone::dispersion' do
:ensure => 'present', :ensure => 'present',
:password => 'dispersion_password', :password => 'dispersion_password',
:email => 'swift@localhost', :email => 'swift@localhost',
:tenant => 'services'
) } ) }
it { is_expected.to contain_keystone_user_role('dispersion@services').with( it { is_expected.to contain_keystone_user_role('dispersion@services').with(
@@ -33,7 +32,6 @@ describe 'swift::keystone::dispersion' do
:ensure => 'present', :ensure => 'present',
:password => 'foo', :password => 'foo',
:email => 'bar@example.com', :email => 'bar@example.com',
:tenant => 'dummyTenant'
) } ) }
it { is_expected.to contain_keystone_user_role('bar@dummyTenant') } it { is_expected.to contain_keystone_user_role('bar@dummyTenant') }