diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-03-27 23:50:18 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-03-27 23:50:18 -0400 |
| commit | 689fe68f23a83a1d03d1ccdf383c0dd1028d83b8 (patch) | |
| tree | 1d40761b1d46d71ce028917274866af4af2f1576 /meta-openstack/recipes-extended/images | |
| parent | 2b65792bd90beaadc6d4eadc4080751c91e77a61 (diff) | |
| download | meta-cloud-services-689fe68f23a83a1d03d1ccdf383c0dd1028d83b8.tar.gz | |
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 <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-extended/images')
| -rw-r--r-- | meta-openstack/recipes-extended/images/openstack-image-compute.bb | 2 | ||||
| -rw-r--r-- | meta-openstack/recipes-extended/images/openstack-image-controller.bb | 5 |
2 files changed, 4 insertions, 3 deletions
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 | |||
| 19 | 19 | ||
| 20 | # Ensure extra space for guest images, and rabbit MQ has a hard coded | 20 | # Ensure extra space for guest images, and rabbit MQ has a hard coded |
| 21 | # check for 2G of free space, so we use 3G as a starting point. | 21 | # check for 2G of free space, so we use 3G as a starting point. |
| 22 | IMAGE_ROOTFS_EXTRA_SPACE = "3000000" | 22 | IMAGE_ROOTFS_EXTRA_SPACE_append += "+ 3000000" |
| 23 | 23 | ||
| 24 | # ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " | 24 | # 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 | |||
| 20 | inherit openstack-base | 20 | inherit openstack-base |
| 21 | 21 | ||
| 22 | # Ensure extra space for guest images, and rabbit MQ has a hard coded | 22 | # Ensure extra space for guest images, and rabbit MQ has a hard coded |
| 23 | # check for 2G of free space, so we use 3G as a starting point. | 23 | # check for 2G of free space, so we use 5G as a starting point. |
| 24 | IMAGE_ROOTFS_EXTRA_SPACE ?= "5000000" | 24 | IMAGE_ROOTFS_EXTRA_SPACE_append += "+ 5000000" |
| 25 | |||