From 1d8121c0a4c746c18a075e699ea3f94db99c21dd Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Wed, 29 Apr 2015 09:24:26 +0000 Subject: Use swift stratum instead of having swift inside openstack-services To avoid duplication and make openstack-services more manageable. Also move duplicated chunk to openstack-common. Change-Id: I97468e5e7757d2250c643eacfcb76826e5c5ed92 --- strata/openstack-common.morph | 14 +++++++ strata/openstack-services.morph | 59 ---------------------------- strata/openstack-services/python-xattr.morph | 8 ---- strata/swift.morph | 21 ++-------- systems/openstack-system-x86_64.morph | 2 + 5 files changed, 19 insertions(+), 85 deletions(-) delete mode 100644 strata/openstack-services/python-xattr.morph diff --git a/strata/openstack-common.morph b/strata/openstack-common.morph index f59f6705..78c04ba6 100644 --- a/strata/openstack-common.morph +++ b/strata/openstack-common.morph @@ -96,3 +96,17 @@ chunks: repo: upstream:simplejson ref: 54d5ff15d508c51366986cc4f77f2f287f036582 unpetrify-ref: v3.6.4 +- name: greenlet + ref: 42b65a7b67dfabd180625155cd4fcd8e51917fe2 + unpetrify-ref: 0.4.5 + repo: upstream:python-packages/greenlet +- name: eventlet + ref: 8d2474197de4827a7bca9c33e71a82573b6fc721 + unpetrify-ref: v0.15.2 + repo: upstream:python-packages/eventlet + build-depends: + - greenlet +- name: pastedeploy + repo: upstream:python-packages/pastedeploy + ref: 5ad87be617c2cc1dd31625688172e964db2756dc + unpetrify-ref: 1.5.2 diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph index 7e9e9032..2010a9cf 100644 --- a/strata/openstack-services.morph +++ b/strata/openstack-services.morph @@ -24,16 +24,6 @@ chunks: repo: upstream:openstack/oslo-rootwrap ref: 62d732277de5cf663172eafe6d3a6c149a9cf814 unpetrify-ref: master -- name: greenlet - ref: 42b65a7b67dfabd180625155cd4fcd8e51917fe2 - unpetrify-ref: 0.4.5 - repo: upstream:python-packages/greenlet -- name: eventlet - ref: 8d2474197de4827a7bca9c33e71a82573b6fc721 - unpetrify-ref: v0.15.2 - repo: upstream:python-packages/eventlet - build-depends: - - greenlet - name: py-amqp repo: upstream:python-packages/py-amqp ref: 875b10d1715def640042c7ff2f42c00a6c07eed1 @@ -187,10 +177,6 @@ chunks: repo: upstream:python-packages/posix-ipc-tarball ref: f3765db04b903b3671733e07cf1541a51966dd14 unpetrify-ref: posix_ipc-0.9.8 -- name: pastedeploy - repo: upstream:python-packages/pastedeploy - ref: 5ad87be617c2cc1dd31625688172e964db2756dc - unpetrify-ref: 1.5.2 - name: paste repo: upstream:python-packages/paste ref: 4c177fce89fee925f0f4fbfde00ce2e1252562c0 @@ -242,20 +228,12 @@ chunks: ref: 8ffb4739d596fb1aac5d62d173d1e6f80270af9d unpetrify-ref: v2.1.fb52 morph: strata/openstack-services/rtslib-fb.morph -- name: netifaces - repo: upstream:python-packages/netifaces - ref: 885b200ba717df87f6e8044ec8c66c677c949bcb - unpetrify-ref: release_0_10_4 - name: networkx repo: upstream:python-packages/networkx ref: 8ac796aba866ade1a56b83e30f25ed392ca3512c unpetrify-ref: v1.9.1 build-depends: - python-decorator -- name: dnspython - repo: upstream:python-packages/dnspython - ref: e1369c62d14f82b80ef11197a490ace5d43bb3f3 - unpetrify-ref: v1.12.0 - name: pexpect repo: upstream:python-packages/pexpect ref: 671417beb41c21f772687c565196fdde444b053b @@ -334,7 +312,6 @@ chunks: ref: 6ea3b12492e86f9e8d109fc3490cc4d3a0edd8b6 unpetrify-ref: 1.4.0.0a5 build-depends: - - eventlet - kombu - name: oslo-vmware repo: upstream:openstack/oslo-vmware @@ -342,7 +319,6 @@ chunks: unpetrify-ref: 0.6.0 build-depends: - suds - - eventlet - name: taskflow repo: upstream:openstack/taskflow ref: 1caaecc5d6b2aa4cde4a50e31d1d993fce7a66c4 @@ -384,11 +360,6 @@ chunks: build-depends: - oslo-messaging - posix-ipc-tarball -- name: python-xattr - morph: strata/openstack-services/python-xattr.morph - repo: upstream:python-packages/xattr - ref: dd10d44e3eb9a1d2303c1f7d5126c099d56e97fc - unpetrify-ref: v0.7.6 - name: keystonemiddleware repo: upstream:openstack/keystonemiddleware ref: a7beb50b38be5c3dd4c44d68ad79d1bb206dab6b @@ -405,18 +376,13 @@ chunks: repo: upstream:openstack/glance_store.git ref: 54f673d4133c1244e2555e7ceb3344c104a74154 unpetrify-ref: 0.1.8 - build-depends: - - eventlet - name: glance repo: upstream:openstack/glance ref: 055adff1d95dca72074da898b541cb4a6b62406d unpetrify-ref: 2014.2.1 build-depends: - - greenlet - sqlalchemy - anyjson - - eventlet - - pastedeploy - routes - boto - sqlalchemy-migrate @@ -440,9 +406,6 @@ chunks: ref: 615f79bb97883eee76923527cea13c2f72baa7ff unpetrify-ref: 2014.2.1 build-depends: - - eventlet - - greenlet - - pastedeploy - paste - routes - sqlalchemy @@ -463,11 +426,8 @@ chunks: unpetrify-ref: 2014.2.1 build-depends: - paste - - pastedeploy - routes - anyjson - - eventlet - - greenlet - httplib2 - jsonrpclib - keystonemiddleware @@ -476,17 +436,6 @@ chunks: - oslo-db - oslo-messaging - oslo-rootwrap -- name: swift - repo: upstream:openstack/swift - ref: 2e8261a4dc0d0af0c4a46478b81e167bcf02220b - unpetrify-ref: 2.2.0 - build-depends: - - dnspython - - eventlet - - greenlet - - netifaces - - pastedeploy - - python-xattr - name: wsgiref repo: upstream:python-packages/wsgiref.git ref: e8360785eef259394e13b2062407edc3c2cbc1e0 @@ -529,12 +478,9 @@ chunks: - anyjson - boto - python-decorator - - eventlet - keystonemiddleware - kombu - routes - - greenlet - - pastedeploy - paste - sqlalchemy-migrate - suds @@ -555,8 +501,6 @@ chunks: unpetrify-ref: 2014.2.1 build-depends: - anyjson - - eventlet - - greenlet - keystonemiddleware - kombu - oslo-db @@ -564,7 +508,6 @@ chunks: - oslo-rootwrap - osprofiler - paste - - pastedeploy - routes - taskflow - rtslib-fb @@ -598,7 +541,6 @@ chunks: - alembic - anyjson - croniter - - eventlet - happybase - jsonpath-rw - keystonemiddleware @@ -607,7 +549,6 @@ chunks: - oslo-db - oslo-rootwrap - oslo-vmware - - pastedeploy - pecan - posix-ipc-tarball - oslo-messaging diff --git a/strata/openstack-services/python-xattr.morph b/strata/openstack-services/python-xattr.morph deleted file mode 100644 index 7916bbf2..00000000 --- a/strata/openstack-services/python-xattr.morph +++ /dev/null @@ -1,8 +0,0 @@ -name: python-xattr -kind: chunk -configure-commands: -- cp -r /usr/lib/python2.7/site-packages/cffi . -build-commands: -- python setup.py build -install-commands: -- python setup.py install --prefix "$PREFIX" --root "$DESTDIR" diff --git a/strata/swift.morph b/strata/swift.morph index 641485b3..22ca8a3a 100644 --- a/strata/swift.morph +++ b/strata/swift.morph @@ -2,30 +2,18 @@ name: swift kind: stratum description: Distributed object storage build-depends: -- morph: strata/openstack-common.morph # for simplejson, cffi +# openstack-common is required for simplejson, cffi, greenlet, +# eventlet, pastedeploy +- morph: strata/openstack-common.morph chunks: - name: dnspython repo: upstream:python-packages/dnspython ref: e1369c62d14f82b80ef11197a490ace5d43bb3f3 unpetrify-ref: v1.12.0 -- name: greenlet - ref: 42b65a7b67dfabd180625155cd4fcd8e51917fe2 - unpetrify-ref: 0.4.5 - repo: upstream:python-packages/greenlet -- name: eventlet - ref: 8d2474197de4827a7bca9c33e71a82573b6fc721 - unpetrify-ref: v0.15.2 - repo: upstream:python-packages/eventlet - build-depends: - - greenlet - name: netifaces repo: upstream:python-packages/netifaces ref: 885b200ba717df87f6e8044ec8c66c677c949bcb unpetrify-ref: release_0_10_4 -- name: pastedeploy - repo: upstream:python-packages/pastedeploy - ref: 5ad87be617c2cc1dd31625688172e964db2756dc - unpetrify-ref: 1.5.2 - name: xattr morph: strata/swift/xattr.morph repo: upstream:python-packages/xattr @@ -37,8 +25,5 @@ chunks: unpetrify-ref: 2.2.0 build-depends: - dnspython - - eventlet - - greenlet - netifaces - - pastedeploy - xattr diff --git a/systems/openstack-system-x86_64.morph b/systems/openstack-system-x86_64.morph index 9072b065..5dffce9e 100644 --- a/systems/openstack-system-x86_64.morph +++ b/systems/openstack-system-x86_64.morph @@ -61,6 +61,8 @@ strata: morph: strata/libsoup-common.morph - name: test-tools morph: strata/test-tools.morph +- name: swift + morph: strata/swift.morph configuration-extensions: - set-hostname - add-config-files -- cgit v1.2.1