Merge pull request #24 from bodepd/diablo

Diablo

README

@@ -17,7 +17,7 @@ Installation
 
 1. Install Python software properties
 
-        $ sudo apt-get install -y python-software-properties 
+        $ sudo apt-get install -y python-software-properties
 
 2. Install the Nova PPA
 
@@ -102,9 +102,7 @@ This will install all of the currently supported openstack components into a sin
 
 run the rake task:
 
-    $ rake build:all
-
-    $ 
+    $ rake build:single
 
 Author
 ------

manifests/hosts.pp

@@ -20,3 +20,5 @@ host { 'compute':
 host { 'glance':
   ip => '172.21.0.16',
 }
+class { 'apt': }
+class { 'openstack::repo::diablo': }

modules/openstack/manifests/repo/diablo.pp

@@ -0,0 +1,3 @@
+class openstack::repo::diablo {
+  apt::ppa { 'ppa:openstack-release/2011.3': }
+}

scripts/run.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
-puppet apply /vagrant/manifests/hosts.pp
+puppet apply /vagrant/manifests/hosts.pp --modulepath /vagrant/modules
 puppet apply /vagrant/manifests/site.pp --modulepath /vagrant/modules --graph --certname $* --graphdir /vagrant/graphs