openstack: extra space, network facilities to controller image and deployment

Various components (such as rabbitmq) have checks for minimum amounts
of free space on a image. If those checks fail, the service exits in
a hard to debug manner. To ensure that these services run, and meet
typical usage scenarios, we increase the free space in the image to 3G.

We also automatically include the network node packages into this image
type, to ensure that full quantum functionality is available.

Finally, we inherit openstack-image-base, to trigger simple rootfs
configuration and deployment.

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

1 files changed, 5 insertions, 2 deletions

diff --git a/meta-openstack/recipes-extended/images/openstack-image-controller.bb b/meta-openstack/recipes-extended/images/openstack-image-controller.bb
index b4bba86..a57b54b 100644
--- a/meta-openstack/recipes-extended/images/openstack-image-controller.bb
+++ b/meta-openstack/recipes-extended/images/openstack-image-controller.bb
@@ -6,11 +6,14 @@ IMAGE_INSTALL = "\
     ${ROOTFS_PKGMANAGE_BOOTSTRAP} \
     packagegroup-core-basic \
     packagegroup-cloud-controller \
+    packagegroup-cloud-network \
     "
 
 IMAGE_FEATURES += " ssh-server-openssh"
 
 inherit core-image
+inherit openstack-base
 
-# Ensure extra space for guest images
-IMAGE_ROOTFS_EXTRA_SPACE = "2000000"
+# Ensure extra space for guest images, and rabbit MQ has a hard coded
+# check for 2G of free space, so we use 3G as a starting point.
+IMAGE_ROOTFS_EXTRA_SPACE = "3000000"