python-nova: Updated configuration files

- Added support for RabbitMQ in the nova.conf file.
- The api-paste.ini file contains the nova credentials.

Signed-off-by: Mihai Prica <prica.mihai@gmail.com>

3 files changed, 123 insertions, 10 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-nova/api-paste.ini b/meta-openstack/recipes-devtools/python/python-nova/api-paste.ini
new file mode 100644
index 0000000..58ffbb0
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-nova/api-paste.ini
@@ -0,0 +1,109 @@
+############
+# Metadata #
+############
+[composite:metadata]
+use = egg:Paste#urlmap
+/: meta
+
+[pipeline:meta]
+pipeline = ec2faultwrap logrequest metaapp
+
+[app:metaapp]
+paste.app_factory = nova.api.metadata.handler:MetadataRequestHandler.factory
+
+#######
+# EC2 #
+#######
+
+[composite:ec2]
+use = egg:Paste#urlmap
+/services/Cloud: ec2cloud
+
+[composite:ec2cloud]
+use = call:nova.api.auth:pipeline_factory
+noauth = ec2faultwrap logrequest ec2noauth cloudrequest validator ec2executor
+keystone = ec2faultwrap logrequest ec2keystoneauth cloudrequest validator ec2executor
+
+[filter:ec2faultwrap]
+paste.filter_factory = nova.api.ec2:FaultWrapper.factory
+
+[filter:logrequest]
+paste.filter_factory = nova.api.ec2:RequestLogging.factory
+
+[filter:ec2lockout]
+paste.filter_factory = nova.api.ec2:Lockout.factory
+
+[filter:ec2keystoneauth]
+paste.filter_factory = nova.api.ec2:EC2KeystoneAuth.factory
+
+[filter:ec2noauth]
+paste.filter_factory = nova.api.ec2:NoAuth.factory
+
+[filter:cloudrequest]
+controller = nova.api.ec2.cloud.CloudController
+paste.filter_factory = nova.api.ec2:Requestify.factory
+
+[filter:authorizer]
+paste.filter_factory = nova.api.ec2:Authorizer.factory
+
+[filter:validator]
+paste.filter_factory = nova.api.ec2:Validator.factory
+
+[app:ec2executor]
+paste.app_factory = nova.api.ec2:Executor.factory
+
+#############
+# Openstack #
+#############
+
+[composite:osapi_compute]
+use = call:nova.api.openstack.urlmap:urlmap_factory
+/: oscomputeversions
+/v1.1: openstack_compute_api_v2
+/v2: openstack_compute_api_v2
+
+[composite:openstack_compute_api_v2]
+use = call:nova.api.auth:pipeline_factory
+noauth = faultwrap sizelimit noauth ratelimit osapi_compute_app_v2
+keystone = faultwrap sizelimit authtoken keystonecontext ratelimit osapi_compute_app_v2
+keystone_nolimit = faultwrap sizelimit authtoken keystonecontext osapi_compute_app_v2
+
+[filter:faultwrap]
+paste.filter_factory = nova.api.openstack:FaultWrapper.factory
+
+[filter:noauth]
+paste.filter_factory = nova.api.openstack.auth:NoAuthMiddleware.factory
+
+[filter:ratelimit]
+paste.filter_factory = nova.api.openstack.compute.limits:RateLimitingMiddleware.factory
+
+[filter:sizelimit]
+paste.filter_factory = nova.api.sizelimit:RequestBodySizeLimiter.factory
+
+[app:osapi_compute_app_v2]
+paste.app_factory = nova.api.openstack.compute:APIRouter.factory
+
+[pipeline:oscomputeversions]
+pipeline = faultwrap oscomputeversionapp
+
+[app:oscomputeversionapp]
+paste.app_factory = nova.api.openstack.compute.versions:Versions.factory
+
+##########
+# Shared #
+##########
+
+[filter:keystonecontext]
+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_port = 35357
+auth_protocol = http
+admin_tenant_name = service
+admin_user = nova
+admin_password = password
+signing_dir = /tmp/keystone-signing-nova
+# Workaround for https://bugs.launchpad.net/nova/+bug/1154809
+auth_version = v2.0
diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova.conf b/meta-openstack/recipes-devtools/python/python-nova/nova.conf
index a1632a0..aee1734 100644
--- a/meta-openstack/recipes-devtools/python/python-nova/nova.conf
+++ b/meta-openstack/recipes-devtools/python/python-nova/nova.conf
@@ -40,9 +40,14 @@ dhcpbridge=/usr/bin/nova-dhcpbridge
 sql_connection = sqlite:////etc/nova/nova.db
 
 #Messaging system
-#fake_rabbit=true
-#Sample Qpid configuration
-rpc_backend=nova.rpc.impl_qpid
-qpid_hostname=localhost
-qpid_broker=5672
 
+#Qpid configuration
+rpc_backend = nova.rpc.impl_qpid
+qpid_hostname = localhost
+qpid_broker = 5672
+
+#RabbitMQ configuration
+#rpc_backend = nova.rpc.impl_kombu
+#rabbit_host = 0.0.0.0
+#rabbit_port = 5672
+#rabbit_password = guest
diff --git a/meta-openstack/recipes-devtools/python/python-nova_2013.1.bb b/meta-openstack/recipes-devtools/python/python-nova_2013.1.bb
index fa4545e..6bba638 100644
--- a/meta-openstack/recipes-devtools/python/python-nova_2013.1.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova_2013.1.bb
@@ -10,7 +10,8 @@ PR = "r0"
 SRCNAME = "nova"
 
 SRC_URI = "https://launchpad.net/${SRCNAME}/grizzly/${PV}/+download/${SRCNAME}-${PV}.tar.gz \
-           file://nova.conf"
+           file://nova.conf \
+           file://api-paste.ini"
 
 
 SRC_URI[md5sum] = "38022353c398ce38c4e220d1d18b5916"
@@ -45,11 +46,9 @@ do_install_append() {
     chown root:root ${D}${sysconfdir}/sudoers.d/nova-rootwrap
     echo "root ALL=(root) NOPASSWD: ${bindir}/nova-rootwrap" > ${D}${sysconfdir}/sudoers.d/nova-rootwrap
 
-    # Get the sample configuration file in place
-    install -m 664 ${S}/etc/nova/api-paste.ini ${NOVA_CONF_DIR}
-
     #Copy the configuration file
-    install -m 664 ${WORKDIR}/nova.conf ${NOVA_CONF_DIR}/nova.conf
+    install -m 664 ${WORKDIR}/nova.conf     ${NOVA_CONF_DIR}/nova.conf
+    install -m 664 ${WORKDIR}/api-paste.ini ${NOVA_CONF_DIR}
 
     # Create the sqlite database
     touch ${NOVA_CONF_DIR}/nova.db