From d3645fecd171ff58bbfe305378fcf38a2a3291fb Mon Sep 17 00:00:00 2001
From: Dan Bode <dan@puppetlabs.com>
Date: Thu, 25 Oct 2012 23:56:04 -0700
Subject: [PATCH] update other repos for folsom

- update other_repos.yaml
- include apache for all in one
---
 examples/site.pp | 2 ++
 other_repos.yaml | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/examples/site.pp b/examples/site.pp
index 879d8fa..0b047c4 100644
--- a/examples/site.pp
+++ b/examples/site.pp
@@ -44,6 +44,8 @@ $auto_assign_floating_ip = false
 # deployed as all-in-one openstack installations.
 node /openstack_all/ {
 
+  include 'apache'
+
   class { 'openstack::all':
     public_address          => $ipaddress_eth0,
     public_interface        => $public_interface,
diff --git a/other_repos.yaml b/other_repos.yaml
index c916493..db20e88 100644
--- a/other_repos.yaml
+++ b/other_repos.yaml
@@ -7,6 +7,8 @@ repos:
     git://github.com/puppetlabs/puppetlabs-swift: swift
     git://github.com/puppetlabs/puppetlabs-keystone: keystone
     git://github.com/puppetlabs/puppetlabs-horizon: horizon
+    git://github.com/puppetlabs/puppetlabs-cinder: cinder
+    git://github.com/bodepd/openstack-quantum-puppet: quantum
     # openstack middleware
     git://github.com/puppetlabs/puppetlabs-rabbitmq: rabbitmq
     git://github.com/puppetlabs/puppetlabs-mysql: mysql
@@ -14,6 +16,8 @@ repos:
     git://github.com/puppetlabs/puppetlabs-vcsrepo: vcsrepo
     git://github.com/saz/puppet-memcached: memcached
     git://github.com/puppetlabs/puppetlabs-rsync: rsync
+    git://github.com/puppetlabs/puppetlabs-apache: apache
+    git://github.com/ekarlso/puppet-vswitch: vswitch
     # other deps
     git://github.com/puppetlabs/puppetlabs-xinetd: xinetd
     git://github.com/saz/puppet-ssh: ssh
@@ -21,7 +25,10 @@ repos:
     git://github.com/puppetlabs/puppetlabs-apt: apt
     git://github.com/ripienaar/puppet-concat: concat
     git://github.com/duritong/puppet-sysctl.git: sysctl
+    git://github.com/cprice-puppet/puppetlabs-inifile: inifile
+
   checkout_branches:
-#  keystone: dev
+    # for some reason this is not checking out to master by default
+    cinder: master
 #  glance: dev
 #    nova: dev