From 2d15aa2dfbbf26ca20318da699d7f6bc977d9ef8 Mon Sep 17 00:00:00 2001
From: newptone <yuxcer@gmail.com>
Date: Sun, 28 Apr 2013 00:09:36 +0800
Subject: [PATCH] Fix the swift test script deployment error

      * The openstack::swift::proxy use a wrong way to deploy the
    swift test script,it use a template as a file type's source.
    Instead, use swift::test_file to replace it.
      * Add new params swift_admin_tenant,swift_admin_user.

    Fixed bug#1173669
Change-Id: I40b352b577a1e4e03e3a64196e3bbec0e47651db
---
 manifests/swift/proxy.pp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/manifests/swift/proxy.pp b/manifests/swift/proxy.pp
index a7804af..327f3a5 100644
--- a/manifests/swift/proxy.pp
+++ b/manifests/swift/proxy.pp
@@ -1,4 +1,6 @@
 class openstack::swift::proxy (
+  $swift_admin_tenant               = 'services',
+  $swift_admin_user                 = 'swift',
   $swift_user_password              = 'swift_pass',
   $swift_hash_suffix                = 'swift_secret',
   $swift_local_net_ip               = $::ipaddress_eth0,
@@ -98,7 +100,10 @@ class openstack::swift::proxy (
   }
 
   # deploy a script that can be used for testing
-  file { '/tmp/swift_keystone_test.rb':
-    source => 'puppet:///modules/swift/swift_keystone_test.rb'
+  class {'swift::test_file':
+    auth_server  => $controller_node_address,
+    tenant       => $swift_admin_tenant,
+    user         => $swift_admin_user,
+    password     => $swift_user_password,
   }
 }