2 files changed, 14 insertions, 0 deletions

diff --git a/meta-openstack/README.setup b/meta-openstack/README.setup
index 05265a3..ab0c261 100644
--- a/meta-openstack/README.setup
+++ b/meta-openstack/README.setup
@@ -103,6 +103,14 @@ be added to local.conf:
 
   IMAGE_INSTALL_append = " cirros-guest-image"
 
+* Cinder Additional Packages *
+
+On compute node, by default openstack-image-compute doesn't include
+initiator iscsi package.  If open-iscsi-user recipe exists in layers,
+the following can be added to local.conf:
+
+  CINDER_EXTRA_FEATURES += "open-iscsi-user"
+
 Running an image
 ----------------
 
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb
index aade21d..b7be27f 100644
--- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb
+++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb
@@ -19,6 +19,8 @@ RDEPENDS_${PN} = " \
     python-novaclient \
     neutron-plugin-openvswitch \
     openvswitch-switch \
+    ${@base_contains('CINDER_EXTRA_FEATURES', 'open-iscsi-user', 'open-iscsi-user', '', d)} \
+    ${@base_contains('CINDER_EXTRA_FEATURES', 'iscsi-initiator-utils', 'iscsi-initiator-utils', '', d)} \
     "
 
 RRECOMMENDS_${PN} = " \
@@ -26,4 +28,8 @@ RRECOMMENDS_${PN} = " \
     kernel-module-kvm-intel \
     kernel-module-kvm-amd \
     kernel-module-nbd \
+    kernel-module-libiscsi-tcp \
+    kernel-module-iscsi-boot-sysfs \
+    kernel-module-iscsi-tcp \
+    kernel-module-libiscsi \
     "