nova: split into explicit compute and controller recipes

To allow unique configuration of nova for compute and controller nodes,
the nova class is split into two, but packaged largely the same way.

The compute and controller classes are introduced to hold configuration
values and operations that are used by the common packaging routines to
customize and deploy.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

3 files changed, 31 insertions, 4 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-nova/0001-nova-api-paste.ini-make-controller-IP-configurable.patch b/meta-openstack/recipes-devtools/python/python-nova/0001-nova-api-paste.ini-make-controller-IP-configurable.patch
new file mode 100644
index 0000000..7d2ed7e
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-nova/0001-nova-api-paste.ini-make-controller-IP-configurable.patch
@@ -0,0 +1,26 @@
+From dd200f769d745ed4cb02faf40ebc32252046d783 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@windriver.com>
+Date: Wed, 28 Aug 2013 01:38:16 -0400
+Subject: [PATCH] nova/api-paste.ini: make controller IP configurable
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
+---
+ etc/nova/api-paste.ini |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/etc/nova/api-paste.ini b/etc/nova/api-paste.ini
+index 34c87b9..c770408 100644
+--- a/etc/nova/api-paste.ini
++++ b/etc/nova/api-paste.ini
+@@ -98,7 +98,7 @@ paste.filter_factory = nova.api.auth:NovaKeystoneContext.factory
+ 
+ [filter:authtoken]
+ paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
+-auth_host = 127.0.0.1
++auth_host = %CONTROLLER_IP%
+ auth_port = 35357
+ auth_protocol = http
+ admin_tenant_name = %SERVICE_TENANT_NAME%
+-- 
+1.7.10.4
+
diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova.conf b/meta-openstack/recipes-devtools/python/python-nova/nova.conf
index dbbd1a8..f698349 100644
--- a/meta-openstack/recipes-devtools/python/python-nova/nova.conf
+++ b/meta-openstack/recipes-devtools/python/python-nova/nova.conf
@@ -34,11 +34,12 @@ force_dhcp_release=False
 dhcpbridge=/usr/bin/nova-dhcpbridge
 
 #Database configuration
-sql_connection = postgresql://%DB_USER%:%DB_PASSWORD%@localhost/nova
+# sql_connection = postgresql://%DB_USER%:%DB_PASSWORD%@localhost/nova
+sql_connection = postgresql://%DB_USER%:%DB_PASSWORD%@%CONTROLLER_HOST%/nova
 
 #RabbitMQ configuration
 rpc_backend = nova.rpc.impl_kombu
-rabbit_host = 0.0.0.0
+rabbit_host = %CONTROLLER_IP% 
 rabbit_port = 5672
 
 #Quantum
diff --git a/meta-openstack/recipes-devtools/python/python-nova/openrc b/meta-openstack/recipes-devtools/python/python-nova/openrc
index 1d0a1ea..c28f355 100644
--- a/meta-openstack/recipes-devtools/python/python-nova/openrc
+++ b/meta-openstack/recipes-devtools/python/python-nova/openrc
@@ -1,6 +1,6 @@
 export OS_TENANT_NAME=admin
 export OS_USERNAME=admin
 export OS_PASSWORD=%OS_PASSWORD%
-export OS_AUTH_URL="http://localhost:5000/v2.0/"
-export SERVICE_ENDPOINT="http://localhost:35357/v2.0"
+export OS_AUTH_URL="http://%CONTROLLER_HOST%:5000/v2.0/"
+export SERVICE_ENDPOINT="http://%CONTROLLER_HOST%:35357/v2.0"
 export SERVICE_TOKEN=%SERVICE_TOKEN%