summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-openstack/recipes-extended/images/openstack-image-compute.bb3
-rw-r--r--meta-openstack/recipes-extended/images/openstack-image-controller.bb3
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 @@
1DESCRIPTION = "Openstack compute node image" 1DESCRIPTION = "Openstack compute node image"
2LICENSE = "MIT" 2LICENSE = "MIT"
3 3
4OPENSTACK_COMPUTE_EXTRA_INSTALL ?= ""
5
4IMAGE_INSTALL = " \ 6IMAGE_INSTALL = " \
5 packagegroup-core-boot \ 7 packagegroup-core-boot \
6 ${ROOTFS_PKGMANAGE_BOOTSTRAP} \ 8 ${ROOTFS_PKGMANAGE_BOOTSTRAP} \
7 packagegroup-cloud-compute \ 9 packagegroup-cloud-compute \
10 ${OPENSTACK_COMPUTE_EXTRA_INSTALL} \
8 " 11 "
9 12
10IMAGE_FEATURES += "ssh-server-openssh" 13IMAGE_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 @@
1DESCRIPTION = "Openstack controller node image" 1DESCRIPTION = "Openstack controller node image"
2LICENSE = "MIT" 2LICENSE = "MIT"
3 3
4OPENSTACK_CONTROLLER_EXTRA_INSTALL ?= ""
5
4IMAGE_INSTALL = "\ 6IMAGE_INSTALL = "\
5 ${CORE_IMAGE_BASE_INSTALL} \ 7 ${CORE_IMAGE_BASE_INSTALL} \
6 ${ROOTFS_PKGMANAGE_BOOTSTRAP} \ 8 ${ROOTFS_PKGMANAGE_BOOTSTRAP} \
7 packagegroup-core-basic \ 9 packagegroup-core-basic \
8 packagegroup-cloud-controller \ 10 packagegroup-cloud-controller \
9 packagegroup-cloud-network \ 11 packagegroup-cloud-network \
12 ${OPENSTACK_CONTROLLER_EXTRA_INSTALL} \
10 " 13 "
11 14
12IMAGE_FEATURES += " ssh-server-openssh" 15IMAGE_FEATURES += " ssh-server-openssh"