diff options
| author | Vu Tran <vu.tran@windriver.com> | 2014-09-23 11:18:56 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-09-24 09:26:05 -0400 |
| commit | 3e5c83508a5d24724a2c6b012a95b0bc1d5b7ced (patch) | |
| tree | 8d810b06041b9f3a01c68964bc3942784690aa10 | |
| parent | 1c34736247f8ae18d054cfecfec54152bf27f1d9 (diff) | |
| download | meta-cloud-services-3e5c83508a5d24724a2c6b012a95b0bc1d5b7ced.tar.gz | |
update to use new packagegroup-ceph
"task-ceph" package group is renamed to "packagegroup-ceph"
so update any file in meta-cloud-services layer that uses
"task-ceph"
Signed-off-by: Vu Tran <vu.tran@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
| -rw-r--r-- | meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb | 2 | ||||
| -rw-r--r-- | meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb index 7d6715c..6d107d7 100644 --- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb +++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb | |||
| @@ -25,7 +25,7 @@ RDEPENDS_${PN} = " \ | |||
| 25 | nfs-utils-client \ | 25 | nfs-utils-client \ |
| 26 | fuse \ | 26 | fuse \ |
| 27 | ${@base_contains('CINDER_EXTRA_FEATURES', 'glusterfs', 'glusterfs glusterfs-fuse', '', d)} \ | 27 | ${@base_contains('CINDER_EXTRA_FEATURES', 'glusterfs', 'glusterfs glusterfs-fuse', '', d)} \ |
| 28 | ${@base_contains('CINDER_EXTRA_FEATURES', 'ceph', 'task-ceph xfsprogs', '', d)} \ | 28 | ${@base_contains('CINDER_EXTRA_FEATURES', 'ceph', 'packagegroup-ceph xfsprogs', '', d)} \ |
| 29 | " | 29 | " |
| 30 | 30 | ||
| 31 | RRECOMMENDS_${PN} = " \ | 31 | RRECOMMENDS_${PN} = " \ |
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb index 42eb99e..ad737e4 100644 --- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb +++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb | |||
| @@ -52,7 +52,7 @@ RDEPENDS_${PN} = " postgresql-setup \ | |||
| 52 | qemu \ | 52 | qemu \ |
| 53 | fuse \ | 53 | fuse \ |
| 54 | ${@base_contains('CINDER_EXTRA_FEATURES', 'glusterfs', 'glusterfs glusterfs-fuse glusterfs-server', '', d)} \ | 54 | ${@base_contains('CINDER_EXTRA_FEATURES', 'glusterfs', 'glusterfs glusterfs-fuse glusterfs-server', '', d)} \ |
| 55 | ${@base_contains('CINDER_EXTRA_FEATURES', 'ceph', 'task-ceph ceph-setup xfsprogs', '', d)} \ | 55 | ${@base_contains('CINDER_EXTRA_FEATURES', 'ceph', 'packagegroup-ceph ceph-setup xfsprogs', '', d)} \ |
| 56 | ${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'openldap python-ldap cyrus-sasl nss-pam-ldapd libsasl2-modules pam-plugin-mkhomedir python-keystone-hybrid-backend', '', d)} \ | 56 | ${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'openldap python-ldap cyrus-sasl nss-pam-ldapd libsasl2-modules pam-plugin-mkhomedir python-keystone-hybrid-backend', '', d)} \ |
| 57 | " | 57 | " |
| 58 | 58 | ||