From e6dd4915221f34e0116c313f02a3cc4981e1d7ce Mon Sep 17 00:00:00 2001
From: mattray <matthewhray@gmail.com>
Date: Tue, 14 Aug 2012 13:05:16 -0500
Subject: [PATCH] nova and horizon, minus nova-compute

---
 infrastructure.yml           | 14 +++++++++++---
 roles/horizon-server.rb      |  9 +++++++++
 roles/nova-api-ec2.rb        |  8 ++++++++
 roles/nova-api-os-compute.rb |  8 ++++++++
 roles/nova-scheduler.rb      |  8 ++++++++
 roles/nova-vncproxy.rb       |  9 +++++++++
 roles/nova-volume.rb         |  8 ++++++++
 roles/single-controller.rb   |  8 +++++++-
 8 files changed, 68 insertions(+), 4 deletions(-)
 create mode 100644 roles/horizon-server.rb
 create mode 100644 roles/nova-api-ec2.rb
 create mode 100644 roles/nova-api-os-compute.rb
 create mode 100644 roles/nova-scheduler.rb
 create mode 100644 roles/nova-vncproxy.rb
 create mode 100644 roles/nova-volume.rb

diff --git a/infrastructure.yml b/infrastructure.yml
index ae3a558..8d72add 100644
--- a/infrastructure.yml
+++ b/infrastructure.yml
@@ -31,9 +31,11 @@ cookbooks:
   - 1.0.3
 - keystone: #used by keystone role
   - 5.0.0
-- glance: #used by glance role
+- glance: #used by glance roles
   - 5.0.0
-- nova: #used by glance role
+- nova: #used by nova roles
+  - 5.0.0
+- horizon: #used by horizon-server role
   - 5.0.0
 
 environments:
@@ -51,8 +53,14 @@ roles:
   - glance-registry:
   - glance:
   - nova-setup:
-  - single-compute:
+  - nova-scheduler:
+  - nova-api-ec2:
+  - nova-api-os-compute:
+  - nova-volume:
+  - nova-vncproxy:
+  - horizon-server:
   - single-controller:
+  - single-compute:
   - allinone:
 
 nodes:
diff --git a/roles/horizon-server.rb b/roles/horizon-server.rb
new file mode 100644
index 0000000..3057ebf
--- /dev/null
+++ b/roles/horizon-server.rb
@@ -0,0 +1,9 @@
+name "horizon-server"
+description "Horizon server"
+run_list(
+  "role[base]",
+  "role[os-database]",
+  "role[os-networks]",
+  "recipe[mysql::client]",
+  "recipe[horizon::server]"
+)
diff --git a/roles/nova-api-ec2.rb b/roles/nova-api-ec2.rb
new file mode 100644
index 0000000..cea7f85
--- /dev/null
+++ b/roles/nova-api-ec2.rb
@@ -0,0 +1,8 @@
+name "nova-api-ec2"
+description "Nova API EC2"
+run_list(
+  "role[base]",
+  "role[os-database]",
+  "role[os-networks]",
+  "recipe[nova::api-ec2]"
+)
diff --git a/roles/nova-api-os-compute.rb b/roles/nova-api-os-compute.rb
new file mode 100644
index 0000000..02fcbb5
--- /dev/null
+++ b/roles/nova-api-os-compute.rb
@@ -0,0 +1,8 @@
+name "nova-api-os-compute"
+description "Nova API for Compute"
+run_list(
+  "role[base]",
+  "role[os-database]",
+  "role[os-networks]",
+  "recipe[nova::api-os-compute]"
+)
diff --git a/roles/nova-scheduler.rb b/roles/nova-scheduler.rb
new file mode 100644
index 0000000..d5aeca6
--- /dev/null
+++ b/roles/nova-scheduler.rb
@@ -0,0 +1,8 @@
+name "nova-scheduler"
+description "Nova scheduler"
+run_list(
+  "role[base]",
+  "role[os-database]",
+  "role[os-networks]",
+  "recipe[nova::scheduler]"
+)
diff --git a/roles/nova-vncproxy.rb b/roles/nova-vncproxy.rb
new file mode 100644
index 0000000..dd0bcc7
--- /dev/null
+++ b/roles/nova-vncproxy.rb
@@ -0,0 +1,9 @@
+name "nova-vncproxy"
+description "Nova VNC Proxy"
+run_list(
+  "role[base]",
+  "role[os-database]",
+  "role[os-networks]",
+  "recipe[nova::vncproxy]"
+)
+
diff --git a/roles/nova-volume.rb b/roles/nova-volume.rb
new file mode 100644
index 0000000..26e5975
--- /dev/null
+++ b/roles/nova-volume.rb
@@ -0,0 +1,8 @@
+name "nova-volume"
+description "Nova Volume Service"
+run_list(
+  "role[base]",
+  "role[os-database]",
+  "role[os-networks]",
+  "recipe[nova::volume]"
+)
diff --git a/roles/single-controller.rb b/roles/single-controller.rb
index f2846c5..24dcae2 100644
--- a/roles/single-controller.rb
+++ b/roles/single-controller.rb
@@ -6,5 +6,11 @@ run_list(
   "role[rabbitmq-server]",
   "role[keystone]",
   "role[glance]",
-  "role[nova-setup]"
+  "role[nova-setup]",
+  "role[nova-scheduler]",
+  "role[nova-api-ec2]",
+  "role[nova-api-os-compute]",
+  "role[nova-volume]",
+  "role[nova-vncproxy]",
+  "role[horizon-server]"
 )