From 0a1626363697a623539eed568c46d60fd0a70a94 Mon Sep 17 00:00:00 2001 From: Adam Vinsh Date: Tue, 3 Nov 2015 15:32:15 -0500 Subject: [PATCH] Remove tenant parameter from keystone_user 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 --- manifests/keystone/dispersion.pp | 1 - spec/classes/swift_keystone_dispersion_spec.rb | 2 -- 2 files changed, 3 deletions(-) diff --git a/manifests/keystone/dispersion.pp b/manifests/keystone/dispersion.pp index 44b830c8..1e1bcdc4 100644 --- a/manifests/keystone/dispersion.pp +++ b/manifests/keystone/dispersion.pp @@ -40,7 +40,6 @@ class swift::keystone::dispersion( ensure => present, password => $auth_pass, email => $email, - tenant => $tenant, } keystone_user_role { "${auth_user}@${tenant}": diff --git a/spec/classes/swift_keystone_dispersion_spec.rb b/spec/classes/swift_keystone_dispersion_spec.rb index 8ab7891a..9b6c0776 100644 --- a/spec/classes/swift_keystone_dispersion_spec.rb +++ b/spec/classes/swift_keystone_dispersion_spec.rb @@ -8,7 +8,6 @@ describe 'swift::keystone::dispersion' do :ensure => 'present', :password => 'dispersion_password', :email => 'swift@localhost', - :tenant => 'services' ) } it { is_expected.to contain_keystone_user_role('dispersion@services').with( @@ -33,7 +32,6 @@ describe 'swift::keystone::dispersion' do :ensure => 'present', :password => 'foo', :email => 'bar@example.com', - :tenant => 'dummyTenant' ) } it { is_expected.to contain_keystone_user_role('bar@dummyTenant') }