2 files changed, 16 insertions, 0 deletions

diff --git a/meta-openstack/recipes-extended/images/openstack-image-controller.bb b/meta-openstack/recipes-extended/images/openstack-image-controller.bb
index 75aa735..36b5b7a 100644
--- a/meta-openstack/recipes-extended/images/openstack-image-controller.bb
+++ b/meta-openstack/recipes-extended/images/openstack-image-controller.bb
@@ -11,6 +11,7 @@ IMAGE_INSTALL = "\
     packagegroup-cloud-network \
     packagegroup-cloud-debug \
     packagegroup-cloud-extras \
+    ${@base_contains('OPENSTACK_EXTRA_FEATURES', 'benchmarking', 'packagegroup-cloud-benchmarking', '', d)} \
     ${OPENSTACK_CONTROLLER_EXTRA_INSTALL} \
     "
 
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-benchmarking.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-benchmarking.bb
new file mode 100644
index 0000000..46f18fb
--- /dev/null
+++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-benchmarking.bb
@@ -0,0 +1,15 @@
+SUMMARY = "Add benchmarking capabilities to cloud images"
+PR = "r0"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+inherit packagegroup
+
+RDEPENDS_${PN} = " \
+    tempest \
+    rally-api \
+    rally-setup \
+    rally-tests \
+    cirros-guest-image \
+    "