From 106487af8f1d02f556d69f5274cf10a6c04c73dc Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Sun, 11 Aug 2013 00:04:39 -0400 Subject: openstack: rename and clarify image names Signed-off-by: Bruce Ashfield --- meta-openstack/DOC | 10 +++++---- meta-openstack/README | 24 ++++++++++++++-------- .../recipes-extended/images/nova-image-compute.bb | 16 --------------- .../images/nova-image-controller.bb | 16 --------------- .../images/openstack-image-compute.bb | 16 +++++++++++++++ .../images/openstack-image-controller.bb | 16 +++++++++++++++ .../images/openstack-image-network.bb | 16 +++++++++++++++ 7 files changed, 69 insertions(+), 45 deletions(-) delete mode 100644 meta-openstack/recipes-extended/images/nova-image-compute.bb delete mode 100644 meta-openstack/recipes-extended/images/nova-image-controller.bb create mode 100644 meta-openstack/recipes-extended/images/openstack-image-compute.bb create mode 100644 meta-openstack/recipes-extended/images/openstack-image-controller.bb create mode 100644 meta-openstack/recipes-extended/images/openstack-image-network.bb (limited to 'meta-openstack') diff --git a/meta-openstack/DOC b/meta-openstack/DOC index 66fa085..160e67a 100644 --- a/meta-openstack/DOC +++ b/meta-openstack/DOC @@ -52,14 +52,16 @@ necessary revisions in the README file. Building an image ----------------- -* There are two new target images: nova-image-compute and nova-image-controller -that contain the packagegroups with the same name, that have been describe -in the previous section. + +* There are three new target images: openstack-image-compute, +openstack-image-network and openstack-image-controller that contain the +packagegroups with the same name, that have been described in the previous +section. * Once a buildir has been initialized you have to append the necessary layers to the bblayers.conf file: /meta-virtualization \ - /meta-openstack \ + /meta-cloud/meta-openstack \ /meta-openembedded/meta-oe \ /meta-openembedded/meta-networking \ diff --git a/meta-openstack/README b/meta-openstack/README index 215d686..b60b3d2 100644 --- a/meta-openstack/README +++ b/meta-openstack/README @@ -12,20 +12,19 @@ This layer depends on: URI: git://github.com/openembedded/oe-core.git branch: master -tag: yocto-1.4.1 +revision: HEAD +prio: default URI: git://github.com/openembedded/meta-oe.git -branch: dylan -revision: HEAD patches: 0001-python-sqlalchemy-update-to-0.7.9.patch +revision: HEAD layers: meta-oe meta-networking - meta-ruby + meta-ruby URI: git://git.yoctoproject.org/meta-virtualization branch: master -revision: 7040db74c375ef55d1b040f53071be29590882de -patches: 0001-linux-yocto-Added-3.8-kernel-bbappend.patch +revision: head The patches for the layers can be found in the patches folder. They can be applied using git am. @@ -33,7 +32,12 @@ applied using git am. Maintenance ----------- -Maintainers: Mihai Prica +Send pull requests, patches, comments or questions to meta-virtualization@yoctoproject.org + +When sending single patches, please using something like: +'git send-email -1 --to meta-virtualization@yoctoproject.org --subject-prefix=meta-virtualization][PATCH' + +Maintainers: Bruce Ashfield License ------- @@ -45,8 +49,10 @@ in tree for individual recipes is under the LICENSE stated in each recipe Target images ------------- -There are two target images: nova-image-compute and nova-image-controller. -This contain the packagegroups with the same name and can be used to create +There are target images: openstack-image-compute, openstack-image-network, +openstack-image-controller. + +They contain the packagegroups with the same name and can be used to create the two types of targets. There are no extra configurations required to build these images. diff --git a/meta-openstack/recipes-extended/images/nova-image-compute.bb b/meta-openstack/recipes-extended/images/nova-image-compute.bb deleted file mode 100644 index 632b21b..0000000 --- a/meta-openstack/recipes-extended/images/nova-image-compute.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Openstack compute node image" -LICENSE = "MIT" - -IMAGE_INSTALL = " \ - packagegroup-core-boot \ - ${ROOTFS_PKGMANAGE_BOOTSTRAP} \ - packagegroup-cloud-compute \ - " - -IMAGE_FEATURES += "ssh-server-openssh" - -inherit core-image - -#IMAGE_ROOTFS_EXTRA_SPACE = "41943040" - -ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " diff --git a/meta-openstack/recipes-extended/images/nova-image-controller.bb b/meta-openstack/recipes-extended/images/nova-image-controller.bb deleted file mode 100644 index b4bba86..0000000 --- a/meta-openstack/recipes-extended/images/nova-image-controller.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Openstack controller node image" -LICENSE = "MIT" - -IMAGE_INSTALL = "\ - ${CORE_IMAGE_BASE_INSTALL} \ - ${ROOTFS_PKGMANAGE_BOOTSTRAP} \ - packagegroup-core-basic \ - packagegroup-cloud-controller \ - " - -IMAGE_FEATURES += " ssh-server-openssh" - -inherit core-image - -# Ensure extra space for guest images -IMAGE_ROOTFS_EXTRA_SPACE = "2000000" diff --git a/meta-openstack/recipes-extended/images/openstack-image-compute.bb b/meta-openstack/recipes-extended/images/openstack-image-compute.bb new file mode 100644 index 0000000..632b21b --- /dev/null +++ b/meta-openstack/recipes-extended/images/openstack-image-compute.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Openstack compute node image" +LICENSE = "MIT" + +IMAGE_INSTALL = " \ + packagegroup-core-boot \ + ${ROOTFS_PKGMANAGE_BOOTSTRAP} \ + packagegroup-cloud-compute \ + " + +IMAGE_FEATURES += "ssh-server-openssh" + +inherit core-image + +#IMAGE_ROOTFS_EXTRA_SPACE = "41943040" + +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 new file mode 100644 index 0000000..b4bba86 --- /dev/null +++ b/meta-openstack/recipes-extended/images/openstack-image-controller.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Openstack controller node image" +LICENSE = "MIT" + +IMAGE_INSTALL = "\ + ${CORE_IMAGE_BASE_INSTALL} \ + ${ROOTFS_PKGMANAGE_BOOTSTRAP} \ + packagegroup-core-basic \ + packagegroup-cloud-controller \ + " + +IMAGE_FEATURES += " ssh-server-openssh" + +inherit core-image + +# Ensure extra space for guest images +IMAGE_ROOTFS_EXTRA_SPACE = "2000000" diff --git a/meta-openstack/recipes-extended/images/openstack-image-network.bb b/meta-openstack/recipes-extended/images/openstack-image-network.bb new file mode 100644 index 0000000..e4dfa29 --- /dev/null +++ b/meta-openstack/recipes-extended/images/openstack-image-network.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Openstack network node image" +LICENSE = "MIT" + +IMAGE_INSTALL = "\ + ${CORE_IMAGE_BASE_INSTALL} \ + ${ROOTFS_PKGMANAGE_BOOTSTRAP} \ + packagegroup-core-basic \ + packagegroup-cloud-network \ + " + +IMAGE_FEATURES += " ssh-server-openssh" + +inherit core-image + +# Ensure extra space for guest images +IMAGE_ROOTFS_EXTRA_SPACE = "2000000" -- cgit v1.2.3-54-g00ecf