From 35d10797261fb9af3b613972e36db50781aa7622 Mon Sep 17 00:00:00 2001
From: Dan Bode <dan@puppetlabs.com>
Date: Tue, 15 Jan 2013 11:57:23 -0800
Subject: [PATCH] add methods for testing swift and deploying a master

---
 Rakefile                          |  7 ++++++-
 lib/puppetlabs/os_tester/swift.rb | 10 ++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index 2e7d0f0..fe84d5c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -140,7 +140,7 @@ namespace :test do
   end
 
   desc 'Checkout fresh master environment and test a two node deployment'
-  task 'master' do
+  task 'openstack_master' do
     refresh_modules
     system "bash -c 'rspec spec/test_two_node.rb;echo $?' 2>&1 | tee #{log_file}"
   end
@@ -177,6 +177,11 @@ namespace :test do
     test_two_node(['redhat', 'ubuntu'])
   end
 
+  desc 'test swift cluster'
+  task 'swift_proxy' do
+    test_swift
+  end
+
   desc 'test all in one deployment on redhat/ubuntu (not yet implemented)'
   task 'all_in_one' do
 
diff --git a/lib/puppetlabs/os_tester/swift.rb b/lib/puppetlabs/os_tester/swift.rb
index f2a4a68..33c9b40 100644
--- a/lib/puppetlabs/os_tester/swift.rb
+++ b/lib/puppetlabs/os_tester/swift.rb
@@ -52,6 +52,16 @@ module Puppetlabs
         )
       end
 
+      # test that our swift cluster if functional
+      def test_swift
+        on_box('swift_proxy', 'ruby /tmp/swift_test_file.rb;exit $?')
+      end
+
+      # deploys a puppetmaster. this is required for deploying swift
+      def deploy_puppetmaster
+        vagrant_command('up', 'puppetmaster')
+      end
+
     end
   end
 end