diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-11-08 14:07:48 -0500 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-11-25 15:25:37 -0500 |
commit | 836f147a23a8524d1f0973d574bb6b71f4e87e41 (patch) | |
tree | c9b4b38ee06823e1051850fc299a2046666944eb | |
parent | f317c6d79f2987f671a339a618b78660ea39bd1e (diff) | |
download | meta-cloud-services-836f147a23a8524d1f0973d574bb6b71f4e87e41.tar.gz |
images: add ceilometer component to compute and controller images
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
3 files changed, 5 insertions, 1 deletions
diff --git a/meta-openstack/recipes-extended/images/openstack-image-compute.bb b/meta-openstack/recipes-extended/images/openstack-image-compute.bb index 2ddce67..4657471 100644 --- a/meta-openstack/recipes-extended/images/openstack-image-compute.bb +++ b/meta-openstack/recipes-extended/images/openstack-image-compute.bb | |||
@@ -16,4 +16,4 @@ inherit openstack-base | |||
16 | # check for 2G of free space, so we use 3G as a starting point. | 16 | # check for 2G of free space, so we use 3G as a starting point. |
17 | IMAGE_ROOTFS_EXTRA_SPACE = "3000000" | 17 | IMAGE_ROOTFS_EXTRA_SPACE = "3000000" |
18 | 18 | ||
19 | ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " | 19 | # ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " |
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb index d519827..2c3d1dd 100644 --- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb +++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb | |||
@@ -11,6 +11,7 @@ RDEPENDS_${PN} = " qemu \ | |||
11 | libvirt-libvirtd \ | 11 | libvirt-libvirtd \ |
12 | libvirt-virsh \ | 12 | libvirt-virsh \ |
13 | nova-compute \ | 13 | nova-compute \ |
14 | ceilometer-compute \ | ||
14 | python-novaclient \ | 15 | python-novaclient \ |
15 | neutron-plugin-openvswitch \ | 16 | neutron-plugin-openvswitch \ |
16 | openvswitch-switch \ | 17 | openvswitch-switch \ |
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb index a9813b6..b5cc582 100644 --- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb +++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb | |||
@@ -22,6 +22,9 @@ RDEPENDS_${PN} = " postgresql \ | |||
22 | cinder-api \ | 22 | cinder-api \ |
23 | cinder-volume \ | 23 | cinder-volume \ |
24 | cinder-scheduler \ | 24 | cinder-scheduler \ |
25 | ceilometer-api \ | ||
26 | ceilometer-collector \ | ||
27 | ceilometer-controller \ | ||
25 | horizon \ | 28 | horizon \ |
26 | novnc \ | 29 | novnc \ |
27 | " | 30 | " |