Merge pull request #282 from rcbops/sprint

End of Sprint 16 Merge
rcbops · Dec 13, 2012 · 6e157f6 · 6e157f6
2 parents 018ac06 + 46891df
commit 6e157f6
Show file tree

Hide file tree

Showing 46 changed files with 66 additions and 41 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -48,7 +48,7 @@
 	url = https://github.com/opscode-cookbooks/xfs.git
 [submodule "cookbooks/rabbitmq"]
 	path = cookbooks/rabbitmq
-	url = https://github.com/rcbops-cookbooks/rabbitmq.git
+	url = https://github.com/opscode-cookbooks/rabbitmq.git
 [submodule "cookbooks/swift"]
 	path = cookbooks/swift
 	url = https://github.com/rcbops-cookbooks/swift.git
@@ -112,3 +112,6 @@
 [submodule "cookbooks/cinder"]
 	path = cookbooks/cinder
 	url = https://github.com/rcbops-cookbooks/cinder.git
+[submodule "cookbooks/haproxy"]
+	path = cookbooks/haproxy
+	url = https://github.com/rcbops-cookbooks/haproxy.git
diff --git a/cookbooks/apache2 b/cookbooks/apache2
diff --git a/cookbooks/apt b/cookbooks/apt
diff --git a/cookbooks/aws b/cookbooks/aws
diff --git a/cookbooks/build-essential b/cookbooks/build-essential
diff --git a/cookbooks/cinder b/cookbooks/cinder
diff --git a/cookbooks/collectd b/cookbooks/collectd
diff --git a/cookbooks/collectd-graphite b/cookbooks/collectd-graphite
diff --git a/cookbooks/collectd-plugins b/cookbooks/collectd-plugins
diff --git a/cookbooks/database b/cookbooks/database
diff --git a/cookbooks/dsh b/cookbooks/dsh
diff --git a/cookbooks/erlang b/cookbooks/erlang
diff --git a/cookbooks/exerstack b/cookbooks/exerstack
diff --git a/cookbooks/glance b/cookbooks/glance
diff --git a/cookbooks/graphite b/cookbooks/graphite
diff --git a/cookbooks/haproxy b/cookbooks/haproxy
diff --git a/cookbooks/hardware b/cookbooks/hardware
diff --git a/cookbooks/horizon b/cookbooks/horizon
diff --git a/cookbooks/keystone b/cookbooks/keystone
diff --git a/cookbooks/kong b/cookbooks/kong
diff --git a/cookbooks/monit b/cookbooks/monit
diff --git a/cookbooks/monitoring b/cookbooks/monitoring
diff --git a/cookbooks/mysql b/cookbooks/mysql
diff --git a/cookbooks/mysql-openstack b/cookbooks/mysql-openstack
diff --git a/cookbooks/nova b/cookbooks/nova
diff --git a/cookbooks/ntp b/cookbooks/ntp
diff --git a/cookbooks/openssh b/cookbooks/openssh
diff --git a/cookbooks/openssl b/cookbooks/openssl
diff --git a/cookbooks/osops-utils b/cookbooks/osops-utils
diff --git a/cookbooks/postgresql b/cookbooks/postgresql
diff --git a/cookbooks/rabbitmq b/cookbooks/rabbitmq
diff --git a/cookbooks/rabbitmq-openstack b/cookbooks/rabbitmq-openstack
diff --git a/cookbooks/rsyslog b/cookbooks/rsyslog
diff --git a/cookbooks/selinux b/cookbooks/selinux
diff --git a/cookbooks/sosreport b/cookbooks/sosreport
diff --git a/cookbooks/swift b/cookbooks/swift
diff --git a/cookbooks/sysctl b/cookbooks/sysctl
diff --git a/cookbooks/xfs b/cookbooks/xfs
diff --git a/cookbooks/yum b/cookbooks/yum
diff --git a/environments/example.json b/environments/example.json
@@ -55,6 +55,6 @@
       "public": "192.168.1.0/24",
       "management": "192.168.1.0/24"
     },
-    "package_component": "essex-final"
+    "package_component": "folsom"
   }
 }
diff --git a/roles/cinder-all.rb b/roles/cinder-all.rb
@@ -2,6 +2,7 @@
 description "Cinder Volume Service"
 run_list(
   "role[base]",
+  "role[cinder-setup]",
   "role[cinder-api]",
   "role[cinder-scheduler]",
   "role[cinder-volume]"

diff --git a/roles/cinder-setup.rb b/roles/cinder-setup.rb
@@ -0,0 +1,6 @@
+name "cinder-setup"
+description "Where the setup operations for cinder get run"
+run_list(
+  "role[base]",
+  "recipe[cinder::cinder-setup]"
+)
diff --git a/roles/haproxy.rb b/roles/haproxy.rb
@@ -0,0 +1,6 @@
+name "haproxy"
+description "install and configure haproxy load balancer for openstack services"
+run_list(
+  "role[base]",
+  "recipe[haproxy::default]"
+)
diff --git a/roles/keystone-api.rb b/roles/keystone-api.rb
@@ -0,0 +1,7 @@
+name "keystone-api"
+description "Keystone API"
+run_list(
+  "role[base]",
+  "recipe[keystone::keystone-api]"
+)
+
diff --git a/roles/keystone.rb b/roles/keystone.rb
@@ -2,6 +2,7 @@
 description "Keystone server"
 run_list(
   "role[base]",
-  "recipe[keystone::server]"
+  "recipe[keystone::server]",
+  "role[keystone-api]"
 )
 
diff --git a/roles/single-controller-cinder.rb b/roles/single-controller-cinder.rb
@@ -11,7 +11,7 @@
   "role[nova-scheduler]",
   "role[nova-api-ec2]",
   "role[nova-api-os-compute]",
-  "role[cinder-volume]",
+  "role[cinder-all]",
   "role[nova-cert]",
   "role[nova-vncproxy]",
   "role[horizon-server]"
+4 −4		attributes/default.rb
+1 −1		metadata.rb
+12 −89		recipes/cinder-api.rb
+7 −4		recipes/cinder-scheduler.rb
+167 −0		recipes/cinder-setup.rb
+7 −4		recipes/cinder-volume.rb
+177 −0		files/ubuntu/collectd-init
+1 −1		metadata.rb
+7 −0		recipes/default.rb
+1 −1		metadata.rb
+16 −15		recipes/api.rb
+6 −6		recipes/registry.rb
+1 −1		metadata.rb
+0 −1		templates/default/folsom/local_settings.py.erb
+217 −85		README.md
+1 −1		metadata.rb
+347 −0		providers/endpoint.rb
+267 −5		providers/register.rb
+184 −0		providers/role.rb
+168 −0		providers/service.rb
+142 −0		providers/tenant.rb
+125 −0		providers/user.rb
+118 −0		recipes/keystone-api.rb
+21 −21		recipes/server.rb
+42 −0		resources/endpoint.rb
+2 −2		resources/register.rb
+41 −0		resources/role.rb
+36 −0		resources/service.rb
+36 −0		resources/tenant.rb
+38 −0		resources/user.rb
+43 −0		README.md
+33 −10		attributes/default.rb
+1 −1		metadata.rb
+12 −12		recipes/api-ec2.rb
+10 −10		recipes/api-os-compute.rb
+4 −4		recipes/essex-final-volume.rb
+1 −0		recipes/folsom-volume.rb
+17 −5		recipes/nova-common.rb
+1 −1		templates/default/essex-final/nova.conf.erb
+11 −2		templates/default/folsom/nova.conf.erb
+61 −21		README.md
+26 −2		libraries/ip_location.rb
+1 −1		metadata.rb
+15 −18		recipes/packages.rb
+7 −0		templates/default/essex/epel-openstack-essex.repo.erb
+1 −1		metadata.rb
+9 −7		recipes/default.rb
+16 −0		templates/default/50-default.conf.erb
+0 −32		templates/default/rsyslog.conf.erb
+1 −1		metadata.rb
+1 −7		recipes/account-server.rb
+1 −7		recipes/common.rb
+1 −7		recipes/container-server.rb
+1 −7		recipes/disks.rb
+7 −13		recipes/management-server.rb
+1 −7		recipes/memcached.rb
+1 −7		recipes/object-server.rb
+11 −17		recipes/proxy-server.rb
+1 −7		recipes/ring-repo.rb
+1 −7		recipes/rsync.rb