diff options
| author | Liam R. Howlett <Liam.Howlett@WindRiver.com> | 2014-09-15 15:53:51 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-09-17 00:48:40 -0400 |
| commit | 269e5c0fde3ce9eaded29150b773b6f337a91940 (patch) | |
| tree | b4940e5f883b7caf496535c167fbbf3f24febe62 | |
| parent | 49603a96f2e3a8f02afdb824a30a8e0454e4fb6b (diff) | |
| download | meta-cloud-services-269e5c0fde3ce9eaded29150b773b6f337a91940.tar.gz | |
troveclient: Split troveclient into separate packages.
Update troveclient to newer git commit to support postgresql and split
the package into a meta-package, the python package, bin package, and
test package. Add the meta-package to the compute image & trove RDEPENDS.
Signed-off-by: Liam R. Howlett <Liam.Howlett@WindRiver.com>
3 files changed, 49 insertions, 2 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-trove_git.bb b/meta-openstack/recipes-devtools/python/python-trove_git.bb index b947a34..c528836 100755 --- a/meta-openstack/recipes-devtools/python/python-trove_git.bb +++ b/meta-openstack/recipes-devtools/python/python-trove_git.bb | |||
| @@ -272,6 +272,7 @@ RDEPENDS_${SRCNAME} = " \ | |||
| 272 | ${SRCNAME}-conductor \ | 272 | ${SRCNAME}-conductor \ |
| 273 | ${SRCNAME}-setup \ | 273 | ${SRCNAME}-setup \ |
| 274 | ${SRCNAME}-taskmanager \ | 274 | ${SRCNAME}-taskmanager \ |
| 275 | troveclient \ | ||
| 275 | " | 276 | " |
| 276 | 277 | ||
| 277 | RDEPENDS_${SRCNAME}-api = " \ | 278 | RDEPENDS_${SRCNAME}-api = " \ |
diff --git a/meta-openstack/recipes-devtools/python/python-troveclient_git.bb b/meta-openstack/recipes-devtools/python/python-troveclient_git.bb index 28a649b..eeae2ea 100644 --- a/meta-openstack/recipes-devtools/python/python-troveclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-troveclient_git.bb | |||
| @@ -1,10 +1,11 @@ | |||
| 1 | DESCRIPTION = "Client Library for OpenStack Datbase service" | 1 | DESCRIPTION = "Trove Client Library for OpenStack Datbase service" |
| 2 | HOMEPAGE = "https://github.com/openstack/python-troveclient" | 2 | HOMEPAGE = "https://github.com/openstack/python-troveclient" |
| 3 | SECTION = "devel/python" | 3 | SECTION = "devel/python" |
| 4 | LICENSE = "Apache-2.0" | 4 | LICENSE = "Apache-2.0" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" |
| 6 | 6 | ||
| 7 | PR = "r0" | 7 | PR = "r0" |
| 8 | SRCNAME = "troveclient" | ||
| 8 | 9 | ||
| 9 | SRC_URI = "\ | 10 | SRC_URI = "\ |
| 10 | git://github.com/openstack/python-troveclient.git;branch=master \ | 11 | git://github.com/openstack/python-troveclient.git;branch=master \ |
| @@ -14,7 +15,40 @@ PV="1.0.7+git${SRCPV}" | |||
| 14 | SRCREV="e010a919750f07493afd42a4db867853b925bcbf" | 15 | SRCREV="e010a919750f07493afd42a4db867853b925bcbf" |
| 15 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
| 16 | 17 | ||
| 17 | inherit setuptools | 18 | inherit setuptools hosts default_configs |
| 19 | |||
| 20 | |||
| 21 | USERADD_PACKAGES = "${PN}" | ||
| 22 | |||
| 23 | PROVIDES += " \ | ||
| 24 | ${SRCNAME} \ | ||
| 25 | ${SRCNAME}-tests \ | ||
| 26 | " | ||
| 27 | |||
| 28 | PACKAGES += " \ | ||
| 29 | ${SRCNAME} \ | ||
| 30 | ${SRCNAME}-bin \ | ||
| 31 | " | ||
| 32 | |||
| 33 | PACKAGES_prepend = " \ | ||
| 34 | ${SRCNAME}-tests \ | ||
| 35 | " | ||
| 36 | |||
| 37 | FILES_${PN} = " \ | ||
| 38 | ${libdir}/* \ | ||
| 39 | " | ||
| 40 | |||
| 41 | FILES_${SRCNAME}-tests = " \ | ||
| 42 | ${libdir}/python*/site-packages/${SRCNAME}/tests/* \ | ||
| 43 | " | ||
| 44 | |||
| 45 | ALLOW_EMPTY_${SRCNAME} = "1" | ||
| 46 | FILES_${SRCNAME} = " \ | ||
| 47 | " | ||
| 48 | |||
| 49 | FILES_${SRCNAME}-bin = " \ | ||
| 50 | ${bindir}/* \ | ||
| 51 | " | ||
| 18 | 52 | ||
| 19 | DEPENDS += " \ | 53 | DEPENDS += " \ |
| 20 | python-pip \ | 54 | python-pip \ |
| @@ -29,3 +63,14 @@ RDEPENDS_${PN} += " \ | |||
| 29 | python-babel \ | 63 | python-babel \ |
| 30 | python-six \ | 64 | python-six \ |
| 31 | " | 65 | " |
| 66 | |||
| 67 | RDEPENDS_${SRCNAME}-tests += "python-mock" | ||
| 68 | |||
| 69 | RDEPENDS_${SRCNAME} += " \ | ||
| 70 | ${PN} \ | ||
| 71 | ${SRCNAME}-bin \ | ||
| 72 | " | ||
| 73 | |||
| 74 | RDEPENDS_${SRCNAME}-bin += " \ | ||
| 75 | ${PN} \ | ||
| 76 | " | ||
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb index 48ac884..7d6715c 100644 --- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb +++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb | |||
| @@ -19,6 +19,7 @@ RDEPENDS_${PN} = " \ | |||
| 19 | python-novaclient \ | 19 | python-novaclient \ |
| 20 | neutron-plugin-openvswitch \ | 20 | neutron-plugin-openvswitch \ |
| 21 | openvswitch-switch \ | 21 | openvswitch-switch \ |
| 22 | troveclient \ | ||
| 22 | ${@base_contains('CINDER_EXTRA_FEATURES', 'open-iscsi-user', 'open-iscsi-user', '', d)} \ | 23 | ${@base_contains('CINDER_EXTRA_FEATURES', 'open-iscsi-user', 'open-iscsi-user', '', d)} \ |
| 23 | ${@base_contains('CINDER_EXTRA_FEATURES', 'iscsi-initiator-utils', 'iscsi-initiator-utils', '', d)} \ | 24 | ${@base_contains('CINDER_EXTRA_FEATURES', 'iscsi-initiator-utils', 'iscsi-initiator-utils', '', d)} \ |
| 24 | nfs-utils-client \ | 25 | nfs-utils-client \ |
