From 689fe68f23a83a1d03d1ccdf383c0dd1028d83b8 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 27 Mar 2014 23:50:18 -0400 Subject: compute/controller: make image extra space additive To ensure that the free space required for proper operation is not clobber by other layers manipulating the extra space variable, we make our additions additive versus absolute. Signed-off-by: Bruce Ashfield --- meta-openstack/recipes-extended/images/openstack-image-compute.bb | 2 +- meta-openstack/recipes-extended/images/openstack-image-controller.bb | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'meta-openstack/recipes-extended/images') diff --git a/meta-openstack/recipes-extended/images/openstack-image-compute.bb b/meta-openstack/recipes-extended/images/openstack-image-compute.bb index 7cc2e28..e9f90e8 100644 --- a/meta-openstack/recipes-extended/images/openstack-image-compute.bb +++ b/meta-openstack/recipes-extended/images/openstack-image-compute.bb @@ -19,6 +19,6 @@ inherit openstack-base # 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" +IMAGE_ROOTFS_EXTRA_SPACE_append += "+ 3000000" # ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " diff --git a/meta-openstack/recipes-extended/images/openstack-image-controller.bb b/meta-openstack/recipes-extended/images/openstack-image-controller.bb index 268f04e..75aa735 100644 --- a/meta-openstack/recipes-extended/images/openstack-image-controller.bb +++ b/meta-openstack/recipes-extended/images/openstack-image-controller.bb @@ -20,5 +20,6 @@ inherit core-image inherit openstack-base # 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 ?= "5000000" +# check for 2G of free space, so we use 5G as a starting point. +IMAGE_ROOTFS_EXTRA_SPACE_append += "+ 5000000" + -- cgit v1.2.3-54-g00ecf