images: add variables for package additions

By default the controller and compute images use IMAGE_INSTALL= to
set their package lists. This doesn't allow a local.conf to add
packages via IMAGE_INSTALL += <FOO>.

To allow package addition, but yet still control the base package list,
there are two variables that can now be used to add packages:

   ${OPENSTACK_COMPUTE_EXTRA_INSTALL}
   ${OPENSTACK_CONTROLLER_EXTRA_INSTALL}

Which variable does what, should be self explanitory.

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

2 files changed, 6 insertions, 0 deletions

diff --git a/meta-openstack/recipes-extended/images/openstack-image-compute.bb b/meta-openstack/recipes-extended/images/openstack-image-compute.bb
index 4657471..34c773f 100644
--- a/meta-openstack/recipes-extended/images/openstack-image-compute.bb
+++ b/meta-openstack/recipes-extended/images/openstack-image-compute.bb
@@ -1,10 +1,13 @@
 DESCRIPTION = "Openstack compute node image"
 LICENSE = "MIT"
 
+OPENSTACK_COMPUTE_EXTRA_INSTALL ?= ""
+
 IMAGE_INSTALL = " \
     packagegroup-core-boot \
     ${ROOTFS_PKGMANAGE_BOOTSTRAP} \
     packagegroup-cloud-compute \
+    ${OPENSTACK_COMPUTE_EXTRA_INSTALL} \
     "
 
 IMAGE_FEATURES += "ssh-server-openssh"
diff --git a/meta-openstack/recipes-extended/images/openstack-image-controller.bb b/meta-openstack/recipes-extended/images/openstack-image-controller.bb
index a57b54b..1f5b6d4 100644
--- a/meta-openstack/recipes-extended/images/openstack-image-controller.bb
+++ b/meta-openstack/recipes-extended/images/openstack-image-controller.bb
@@ -1,12 +1,15 @@
 DESCRIPTION = "Openstack controller node image"
 LICENSE = "MIT"
 
+OPENSTACK_CONTROLLER_EXTRA_INSTALL ?= ""
+
 IMAGE_INSTALL = "\
     ${CORE_IMAGE_BASE_INSTALL} \
     ${ROOTFS_PKGMANAGE_BOOTSTRAP} \
     packagegroup-core-basic \
     packagegroup-cloud-controller \
     packagegroup-cloud-network \
+    ${OPENSTACK_CONTROLLER_EXTRA_INSTALL} \
     "
 
 IMAGE_FEATURES += " ssh-server-openssh"