stackforge/puppet-openstack
Code Issues Proposed changes

Merge pull request #24 from bodepd/diablo

Browse Source 
Diablo
This commit is contained in:
Dan Bode
2011-10-04 10:47:36 -07:00
parent 99a8c7dc02 a0421e9e33
commit d7e7a82d11
6 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README
View File

@@ -17,7 +17,7 @@ Installation
1. Install Python software properties 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 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: run the rake task:
$ rake build:all $ rake build:single
$
Author Author
------ ------

2
manifests/hosts.pp
View File

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

2
modules/glance

Submodule modules/glance updated: ba246b2d40...f8b922582d

2
modules/nova

Submodule modules/nova updated: ca8850b8fd...807a437471

3
modules/openstack/manifests/repo/diablo.pp Normal file
View File

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

2
scripts/run.sh
View File

@@ -1,3 +1,3 @@
#!/bin/bash #!/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 puppet apply /vagrant/manifests/site.pp --modulepath /vagrant/modules --graph --certname $* --graphdir /vagrant/graphs