summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-03-04 09:54:57 (GMT)
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-03-04 09:54:57 (GMT)
commit4441782c2fa7e07198d5862ab6c73ea308c82f95 (patch)
tree47b1fd626b77ebd9b603fae0df89059da95268a6
parent6cf64f572b2af6c6cb0586f4b5c6431b24025c34 (diff)
parentbacf44def1cccce99f34ca0018ec7f7e52011c36 (diff)
downloaddefinitions-4441782c2fa7e07198d5862ab6c73ea308c82f95.tar.gz
Merge branch 'baserock/franred/fix-openstack-chunk-duplicity'
Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk> Reviewed-By: Javier Jardón <javier.jardon@codethink.co.uk> Reviewed-By: Sam Thursfield <sam.thursfield@codethink.co.uk>
-rw-r--r--strata/openstack-clients.morph13
-rw-r--r--strata/openstack-common.morph2
2 files changed, 1 insertions, 14 deletions
diff --git a/strata/openstack-clients.morph b/strata/openstack-clients.morph
index a4eb0ce..65f3885 100644
--- a/strata/openstack-clients.morph
+++ b/strata/openstack-clients.morph
@@ -4,23 +4,10 @@ description: Stratum with all the OpenStack clients and their dependencies.
build-depends:
- morph: strata/openstack-common.morph
chunks:
-- name: python-json-pointer
- repo: upstream:python-json-pointer
- ref: 34073e561261cb413b9bdff5beac31b070d98ea2
- unpetrify-ref: v1.4
- build-depends: []
-- name: python-json-patch
- repo: upstream:python-json-patch
- ref: e4da658a5dc9f68d3386017ffdcc8e07d22b51a3
- unpetrify-ref: v1.8
- build-depends:
- - python-json-pointer
- name: warlock
repo: upstream:warlock
ref: 408ccb82347aabf3dc7cf6eccbd2ed2475cb0d60
unpetrify-ref: 1.1.0
- build-depends:
- - python-json-pointer
build-depends: []
- name: python-keystoneclient
repo: upstream:openstack/python-keystoneclient
diff --git a/strata/openstack-common.morph b/strata/openstack-common.morph
index df92a2c..396d77c 100644
--- a/strata/openstack-common.morph
+++ b/strata/openstack-common.morph
@@ -4,7 +4,7 @@ description: |
Stratum with the python packages needed to compile openstack
clients and services.
build-depends:
-- morph: strata/python-core.morph
+- morph: strata/python-common.morph
- morph: strata/foundation.morph
chunks:
- name: pycparser