diff options
author | Amy Fong <amy.fong@windriver.com> | 2014-04-11 14:01:29 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-04-15 19:49:52 -0400 |
commit | 496304e28096f01657d1160507b1df4bf50d538f (patch) | |
tree | b568519f38999c1135ff0e5fee918d0fd15b2c52 | |
parent | c533b15bb52825f9062d2c7b7e945fb6205c7503 (diff) | |
download | meta-cloud-services-496304e28096f01657d1160507b1df4bf50d538f.tar.gz |
OpenStack: all-in-one node
Introduce image openstack-image-aio, integrating both compute and controller functionality
Signed-off-by: Amy Fong <amy.fong@windriver.com>
-rw-r--r-- | meta-openstack-aio-deploy/README | 48 | ||||
-rw-r--r-- | meta-openstack-aio-deploy/classes/hosts.bbclass | 17 | ||||
-rw-r--r-- | meta-openstack-aio-deploy/conf/layer.conf | 10 | ||||
-rw-r--r-- | meta-openstack-aio-deploy/recipes-devtools/python/python-neutron_git.bbappend | 1 | ||||
-rw-r--r-- | meta-openstack/recipes-extended/guest-images/cirros_0.3.0.bb (renamed from meta-openstack-controller-deploy/recipes-extended/guest-images/cirros_0.3.0.bb) | 0 | ||||
-rw-r--r-- | meta-openstack/recipes-extended/images/openstack-image-aio.bb | 29 |
6 files changed, 105 insertions, 0 deletions
diff --git a/meta-openstack-aio-deploy/README b/meta-openstack-aio-deploy/README new file mode 100644 index 0000000..3603739 --- /dev/null +++ b/meta-openstack-aio-deploy/README | |||
@@ -0,0 +1,48 @@ | |||
1 | meta-openstack-aio-deploy | ||
2 | ============================= | ||
3 | |||
4 | This layer provides support configuring and deploying the recipes to create an | ||
5 | all-in-one compute/controller node. | ||
6 | |||
7 | Dependencies | ||
8 | ------------ | ||
9 | |||
10 | This layer depends on: | ||
11 | |||
12 | URI: git://github.com/openembedded/oe-core.git | ||
13 | branch: master | ||
14 | revision: HEAD | ||
15 | prio: default | ||
16 | |||
17 | URI: git://github.com/openembedded/meta-oe.git | ||
18 | patches: 0001-python-sqlalchemy-update-to-0.7.9.patch | ||
19 | revision: HEAD | ||
20 | layers: meta-oe | ||
21 | meta-networking | ||
22 | meta-ruby | ||
23 | |||
24 | URI: git://git.yoctoproject.org/meta-virtualization | ||
25 | branch: master | ||
26 | revision: head | ||
27 | |||
28 | meta-openstack | ||
29 | branch: master | ||
30 | revision: head | ||
31 | |||
32 | Maintenance | ||
33 | ----------- | ||
34 | |||
35 | Send pull requests, patches, comments or questions to meta-virtualization@yoctoproject.org | ||
36 | |||
37 | When sending single patches, please using something like: | ||
38 | 'git send-email -1 --to meta-virtualization@yoctoproject.org --subject-prefix=meta-virtualization][PATCH' | ||
39 | |||
40 | Maintainers: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
41 | |||
42 | License | ||
43 | ------- | ||
44 | |||
45 | All metadata is MIT licensed unless otherwise stated. Source code included | ||
46 | in tree for individual recipes is under the LICENSE stated in each recipe | ||
47 | (.bb file) unless otherwise stated. | ||
48 | |||
diff --git a/meta-openstack-aio-deploy/classes/hosts.bbclass b/meta-openstack-aio-deploy/classes/hosts.bbclass new file mode 100644 index 0000000..82c9eb7 --- /dev/null +++ b/meta-openstack-aio-deploy/classes/hosts.bbclass | |||
@@ -0,0 +1,17 @@ | |||
1 | # | ||
2 | # all-in-one hosts file | ||
3 | # | ||
4 | # The aio rootfs combines the functionality of the compute and | ||
5 | # the controller in one node. | ||
6 | # | ||
7 | # The aio rootfs adds another hostname aio, since we need | ||
8 | # ths hostname compute and controller for the system's functionality, | ||
9 | # we defined compute and controller in this file as well. | ||
10 | # | ||
11 | COMPUTE_IP ?= "${CONTROLLER_IP}" | ||
12 | COMPUTE_HOST ?= "compute" | ||
13 | CONTROLLER_IP ?= "128.224.149.173" | ||
14 | CONTROLLER_HOST ?= "controller" | ||
15 | MY_IP ?= "${CONTROLLER_IP}" | ||
16 | MY_HOST ?= "${CONTROLLER_HOST}" | ||
17 | DB_DATADIR ?= "/etc/postgresql" | ||
diff --git a/meta-openstack-aio-deploy/conf/layer.conf b/meta-openstack-aio-deploy/conf/layer.conf new file mode 100644 index 0000000..d1d1f64 --- /dev/null +++ b/meta-openstack-aio-deploy/conf/layer.conf | |||
@@ -0,0 +1,10 @@ | |||
1 | # We have a conf and classes directory, append to BBPATH | ||
2 | BBPATH .= ":${LAYERDIR}" | ||
3 | |||
4 | # We have a recipes directory, add to BBFILES | ||
5 | BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend ${LAYERDIR}/classes/*.bbclass" | ||
6 | |||
7 | BBFILE_COLLECTIONS += "openstack-aio-deploy-layer" | ||
8 | BBFILE_PATTERN_openstack-aio-deploy-layer := "^${LAYERDIR}/" | ||
9 | BBFILE_PRIORITY_openstack-aio-deploy-layer = "6" | ||
10 | |||
diff --git a/meta-openstack-aio-deploy/recipes-devtools/python/python-neutron_git.bbappend b/meta-openstack-aio-deploy/recipes-devtools/python/python-neutron_git.bbappend new file mode 100644 index 0000000..28b44ec --- /dev/null +++ b/meta-openstack-aio-deploy/recipes-devtools/python/python-neutron_git.bbappend | |||
@@ -0,0 +1 @@ | |||
inherit hosts | |||
diff --git a/meta-openstack-controller-deploy/recipes-extended/guest-images/cirros_0.3.0.bb b/meta-openstack/recipes-extended/guest-images/cirros_0.3.0.bb index 459628a..459628a 100644 --- a/meta-openstack-controller-deploy/recipes-extended/guest-images/cirros_0.3.0.bb +++ b/meta-openstack/recipes-extended/guest-images/cirros_0.3.0.bb | |||
diff --git a/meta-openstack/recipes-extended/images/openstack-image-aio.bb b/meta-openstack/recipes-extended/images/openstack-image-aio.bb new file mode 100644 index 0000000..57f4249 --- /dev/null +++ b/meta-openstack/recipes-extended/images/openstack-image-aio.bb | |||
@@ -0,0 +1,29 @@ | |||
1 | DESCRIPTION = "Openstack all-in-one node image" | ||
2 | LICENSE = "MIT" | ||
3 | |||
4 | OPENSTACK_CONTROLLER_EXTRA_INSTALL ?= "" | ||
5 | OPENSTACK_COMPUTE_EXTRA_INSTALL ?= "" | ||
6 | OPENSTACK_AIO_EXTRA_INSTALL ?= "" | ||
7 | |||
8 | IMAGE_INSTALL = " \ | ||
9 | ${ROOTFS_PKGMANAGE_BOOTSTRAP} \ | ||
10 | ${CORE_IMAGE_BASE_INSTALL} \ | ||
11 | packagegroup-core-full-cmdline \ | ||
12 | packagegroup-cloud-compute \ | ||
13 | packagegroup-cloud-controller \ | ||
14 | packagegroup-cloud-network \ | ||
15 | packagegroup-cloud-debug \ | ||
16 | packagegroup-cloud-extras \ | ||
17 | ${OPENSTACK_CONTROLLER_EXTRA_INSTALL} \ | ||
18 | ${OPENSTACK_COMPUTE_EXTRA_INSTALL} \ | ||
19 | ${OPENSTACK_AIO_EXTRA_INSTALL} \ | ||
20 | " | ||
21 | |||
22 | IMAGE_FEATURES += "ssh-server-openssh" | ||
23 | |||
24 | inherit core-image | ||
25 | inherit openstack-base | ||
26 | |||
27 | # check for 5G of free space, so we use 5G as a starting point. | ||
28 | IMAGE_ROOTFS_EXTRA_SPACE_append += "+ 5000000" | ||
29 | |||