From fa44b157720c1c84335c9f732a08280e1b5f010b Mon Sep 17 00:00:00 2001
From: Dan Bode <dan@puppetlabs.com>
Date: Thu, 30 Jun 2011 16:29:14 -0700
Subject: [PATCH] updated Rakefile

- changed all task to single
(to match with multi)
- fixed bug changes instance to instances
---
 README       | 29 +++++++++++++++++++++++++++++
 Rakefile     |  8 ++++----
 modules/nova |  2 +-
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/README b/README
index df9b2c2..ef88842 100644
--- a/README
+++ b/README
@@ -69,6 +69,34 @@ Usage
 
         $ euca-describe-instances
 
+Installing With Vagrant
+------------------------
+
+These examples assume that you have a suitable image that you can
+use for testing.
+
+1. Export the environment variable:
+
+Step one is to export an environment variable of the vagrant box.
+
+All of my testing has been done using a Natty image.
+
+2. Download glance images for testing:
+
+        $ mkdir images
+        $ cd images
+        $ curl -g -o ttylinux-uec-i686-12.1_2.6.35-22_1.tar.gz  http://smoser.brickies.net/ubuntu/ttylinux-uec/ttylinux-uec-i686-12.1_2.6.35-22_1.tar.gz
+
+2. Testing single node installation:
+
+This will install all of the currently supported openstack components into a single node.
+
+run the rake task:
+
+    $ rake build:all
+
+    $ 
+
 Author
 ------
 
@@ -92,3 +120,4 @@ License
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
+
diff --git a/Rakefile b/Rakefile
index d71b0a7..06ecf0c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -17,13 +17,13 @@ instances = [
 namespace :build do
   desc 'build out 5 node openstack cluster'
   task :multi do
-    instance.each do |instance|
+    instances.each do |instance|
       build(instance, env)
     end
   end
   desc 'build out openstack on one node'
-  task :all do
-    build(:all, env)
+  task :single do
+    build(:single, env)
   end
 end
 
@@ -57,7 +57,7 @@ namespace :test do
     end
   end
   desc 'test single node installation'
-  task :all do
+  task :single do
     test(:all, ['sudo /vagrant/ext/glance.sh', 'sudo /vagrant/ext/nova.sh'], env)
   end
 end
diff --git a/modules/nova b/modules/nova
index 321d2ae..9464483 160000
--- a/modules/nova
+++ b/modules/nova
@@ -1 +1 @@
-Subproject commit 321d2ae3c26bb11f2caa71b039630e8a0de627bb
+Subproject commit 946448309b9e07756c324e90ad5acbfa0cd0838c