Merge pull request #25 from bodepd/dev

Essex

.gitmodules

@@ -19,3 +19,30 @@
 [submodule "modules/create_resources"]
 	path = modules/create_resources
 	url = git://github.com/puppetlabs/puppetlabs-create_resources.git
+[submodule "modules/concat"]
+	path = modules/concat
+	url = git://github.com/puppetlabs/puppet-concat
+[submodule "modules/keystone"]
+	path = modules/keystone
+	url = git://github.com/puppetlabs/puppetlabs-keystone
+[submodule "modules/rsync"]
+	path = modules/rsync
+	url = git://github.com/puppetlabs/puppet-rsync
+[submodule "modules/ssh"]
+	path = modules/ssh
+	url = git://github.com/saz/puppet-ssh
+[submodule "modules/memcached"]
+	path = modules/memcached
+	url = git://github.com/saz/puppet-memcached
+[submodule "modules/xinetd"]
+	path = modules/xinetd
+	url = git://github.com/ghoneycutt/xinetd
+[submodule "modules/swift"]
+	path = modules/swift
+	url = git://github.com/puppetlabs/puppetlabs-swft
+[submodule "puppetlabs-keystone"]
+	path = puppetlabs-keystone
+	url = git://github.com/puppetlabs/puppetlabs-keystone
+[submodule "modules/vcsrepo"]
+	path = modules/vcsrepo
+	url = git://github.com/puppetlabs/puppet-vcsrepo

modules/openstack/manifests/repo/diablo.pp

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

scripts/blank.sh

@@ -0,0 +1 @@
+#!/bin/bash

scripts/install-pe-master.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+puppet apply /vagrant/manifests/hosts.pp --modulepath /vagrant/modules --debug
+curl https://s3.amazonaws.com/pe-builds/released/2.0.1/puppet-enterprise-2.0.1-el-6-i386.tar.gz 

scripts/run-master.sh

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

scripts/run-swift-all.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+# TODO fix this, the image that I am using is broken
+apt-get update
+puppet apply /vagrant/manifests/hosts.pp --modulepath /vagrant/modules --debug
+puppet apply /vagrant/modules/swift/examples/all.pp --modulepath /vagrant/modules --graph --certname $* --graphdir /vagrant/graphs --debug --trace

scripts/run-swift-multi.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+apt-get update
+puppet apply /vagrant/manifests/hosts.pp --modulepath /vagrant/modules --debug
+puppet agent --server puppetmaster --certname $* --debug --trace --test --pluginsync true