From b885ed74885957fbac8ef47567e870b9ec02f28c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Charlier?= <fcharlier@ploup.net>
Date: Wed, 21 Nov 2012 20:15:53 +0100
Subject: [PATCH 1/2] Update swift::keystone::dispersion
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

• Use the new keystone_user & keystone_user_role parameters
• Add email & tenant parameters
---
 manifests/keystone/dispersion.pp              |  8 +++--
 .../classes/swift_keystone_dispersion_spec.rb | 31 ++++++++-----------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/manifests/keystone/dispersion.pp b/manifests/keystone/dispersion.pp
index 15ea2193..265af130 100644
--- a/manifests/keystone/dispersion.pp
+++ b/manifests/keystone/dispersion.pp
@@ -24,15 +24,19 @@
 
 class swift::keystone::dispersion(
   $auth_user = 'dispersion',
-  $auth_pass = 'dispersion_password'
+  $auth_pass = 'dispersion_password',
+  $email     = 'swift@localhost',
+  $tenant    = 'services',
 ) {
 
   keystone_user { $auth_user:
     ensure   => present,
     password => $auth_pass,
+    email    => $email,
+    tenant   => $tenant,
   }
 
-  keystone_user_role { "${auth_user}@services":
+  keystone_user_role { "${auth_user}@${tenant}":
     ensure  => present,
     roles   => 'admin',
     require => Keystone_user[$auth_user]
diff --git a/spec/classes/swift_keystone_dispersion_spec.rb b/spec/classes/swift_keystone_dispersion_spec.rb
index ff77817c..61d111b5 100644
--- a/spec/classes/swift_keystone_dispersion_spec.rb
+++ b/spec/classes/swift_keystone_dispersion_spec.rb
@@ -6,7 +6,9 @@ describe 'swift::keystone::dispersion' do
 
     it { should contain_keystone_user('dispersion').with(
       :ensure   => 'present',
-      :password => 'dispersion_password'
+      :password => 'dispersion_password',
+      :email    => 'swift@localhost',
+      :tenant   => 'services'
     ) }
 
     it { should contain_keystone_user_role('dispersion@services').with(
@@ -16,32 +18,25 @@ describe 'swift::keystone::dispersion' do
     ) }
   end
 
-  describe 'when overriding password' do
+  describe 'when overriding parameters' do
 
     let :params do
       {
-        :auth_pass => 'foo'
+        :auth_user => 'bar',
+        :auth_pass => 'foo',
+        :email     => 'bar@example.com',
+        :tenant    => 'dummyTenant'
       }
     end
 
-    it { should contain_keystone_user('dispersion').with(
+    it { should contain_keystone_user('bar').with(
       :ensure   => 'present',
-      :password => 'foo'
+      :password => 'foo',
+      :email    => 'bar@example.com',
+      :tenant   => 'dummyTenant'
     ) }
 
-  end
-
-  describe 'when overriding auth user' do
-
-    let :params do
-      {
-        :auth_user => 'bar'
-      }
-    end
-
-    it { should contain_keystone_user('bar') }
-
-    it { should contain_keystone_user_role('bar@services') }
+    it { should contain_keystone_user_role('bar@dummyTenant') }
 
   end
 

From 63cb9e735d971b9336b9361cb4ab0a1fb1913918 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Charlier?= <fcharlier@ploup.net>
Date: Wed, 12 Dec 2012 10:35:26 +0100
Subject: [PATCH 2/2] Remove trailing coma for Puppet 2.6 compat.

---
 manifests/keystone/dispersion.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/keystone/dispersion.pp b/manifests/keystone/dispersion.pp
index 265af130..8bf2e040 100644
--- a/manifests/keystone/dispersion.pp
+++ b/manifests/keystone/dispersion.pp
@@ -26,7 +26,7 @@ class swift::keystone::dispersion(
   $auth_user = 'dispersion',
   $auth_pass = 'dispersion_password',
   $email     = 'swift@localhost',
-  $tenant    = 'services',
+  $tenant    = 'services'
 ) {
 
   keystone_user { $auth_user: