Permalink
Browse files

Merge pull request #12 from bodepd/dev

Dev
  • Loading branch information...
2 parents b5268b7 + 8362098 commit 500c81e8f0c0145688c30ad577834f4a75dfa509 @bodepd bodepd committed Apr 13, 2012
Showing with 48 additions and 7 deletions.
  1. +6 −3 config/nova/nova_single
  2. +34 −0 config/nova/nova_single_fedora
  3. +5 −4 config/swift/swift_multi
  4. +3 −0 lib/puppet/face/stack.rb
View
9 config/nova/nova_single
@@ -7,19 +7,22 @@ nodes:
options:
install:
git_repos:
+ git://github.com/bodepd/puppetlabs-nova: /etc/puppet/modules/nova
git://github.com/bodepd/puppetlabs-glance: /etc/puppet/modules/glance
git://github.com/bodepd/puppetlabs-keystone: /etc/puppet/modules/keystone
- git://github.com/bodepd/puppetlabs-nova: /etc/puppet/modules/nova
- git://github.com/bodepd/puppetlabs-mysql: /etc/puppet/modules/mysql
+ git://github.com/puppetlabs/puppetlabs-horizon: /etc/puppet/modules/horizon
+ git://github.com/puppetlabs/puppetlabs-mysql: /etc/puppet/modules/mysql
git://github.com/puppetlabs/puppetlabs-rabbitmq: /etc/puppet/modules/rabbitmq
git://github.com/puppetlabs/puppetlabs-stdlib: /etc/puppet/modules/stdlib
git://github.com/puppetlabs/puppet-concat: concat
git://github.com/puppetlabs/puppet-apt: /etc/puppet/modules/apt
+ git://github.com/saz/puppet-memcached: /etc/puppet/modules/memcached
git_checkout:
/etc/puppet/modules/keystone: dev
/etc/puppet/modules/glance: dev
/etc/puppet/modules/nova: dev
- /etc/puppet/modules/mysql: dev
+ # /etc/puppet/modules/mysql: dev
+ # /etc/puppet/modules/horizon: dev
manifest: /etc/puppet/modules/nova/examples/all.pp
options:
# test:
View
34 config/nova/nova_single_fedora
@@ -0,0 +1,34 @@
+# this creates the new image to build
+puppet_run_type: apply
+nodes:
+# nova all in one installation
+ - all:
+ create:
+ options:
+ image: ami-837249f7
+ region: eu-west-1
+ install:
+ install_puppet: true
+ git_repos:
+ git://github.com/bodepd/puppetlabs-nova: /etc/puppet/modules/nova
+ git://github.com/bodepd/puppetlabs-glance: /etc/puppet/modules/glance
+ git://github.com/bodepd/puppetlabs-keystone: /etc/puppet/modules/keystone
+ git://github.com/puppetlabs/puppetlabs-horizon: /etc/puppet/modules/horizon
+ git://github.com/puppetlabs/puppetlabs-mysql: /etc/puppet/modules/mysql
+ git://github.com/puppetlabs/puppetlabs-rabbitmq: /etc/puppet/modules/rabbitmq
+ git://github.com/puppetlabs/puppetlabs-stdlib: /etc/puppet/modules/stdlib
+ git://github.com/puppetlabs/puppet-concat: concat
+ git://github.com/puppetlabs/puppet-apt: /etc/puppet/modules/apt
+ git://github.com/saz/puppet-memcached: /etc/puppet/modules/memcached
+ git_checkout:
+ /etc/puppet/modules/keystone: dev
+ /etc/puppet/modules/glance: dev
+ /etc/puppet/modules/nova: dev
+ # /etc/puppet/modules/mysql: dev
+ manifest: /etc/puppet/modules/nova/examples/all.pp
+ options:
+ login:
+ ec2-user
+# test:
+# command: ruby /etc/puppet/modules/swift/ext/swift.rb
+# options:
View
9 config/swift/swift_multi
@@ -13,16 +13,17 @@ master:
answers_payload: https://s3.amazonaws.com/puppetlabs-bizdev/answers_full_stack_builder
git_repos:
git://github.com/bodepd/puppet-xinetd: /etc/puppetlabs/puppet/modules/xinetd
- git://github.com/bodepd/puppetlabs-rsync: /etc/puppetlabs/puppet/modules/rsync
git://github.com/saz/puppet-ssh: /etc/puppetlabs/puppet/modules/ssh
git://github.com/saz/puppet-memcached: /etc/puppetlabs/puppet/modules/memcached
- git://github.com/bodepd/puppetlabs-swift: /etc/puppetlabs/puppet/modules/swift
+ git://github.com/puppetlabs/puppetlabs-rsync: /etc/puppetlabs/puppet/modules/rsync
+ git://github.com/puppetlabs/puppetlabs-swift: /etc/puppetlabs/puppet/modules/swift
+ git://github.com/puppetlabs/puppetlabs-keystone: /etc/puppetlabs/puppet/modules/keystone
git://github.com/puppetlabs/puppetlabs-stdlib: /etc/puppetlabs/puppet/modules/stdlib
git://github.com/puppetlabs/puppet-apt: /etc/puppetlabs/puppet/modules/apt
git://github.com/puppetlabs/puppetlabs-mysql: /etc/puppetlabs/puppet/modules/mysql
git://github.com/puppetlabs/puppet-concat: /etc/puppetlabs/puppet/modules/concat
- git_checkout:
- /etc/puppetlabs/puppet/modules/swift: dev
+ #git_checkout:
+ # /etc/puppetlabs/puppet/modules/swift: dev
cp_files:
/etc/puppetlabs/puppet/modules/swift/examples/multi.pp /etc/puppetlabs/puppet/manifests/site.pp
nodes:
View
3 lib/puppet/face/stack.rb
@@ -66,6 +66,9 @@
when_invoked do |options|
Puppet.fail('Install is not yet implemented')
end
+ when_rendering :console do |value|
+ value.inspect if value
+ end
end
action :test do

0 comments on commit 500c81e

Please sign in to comment.