summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Ipsum <richard.ipsum@codethink.co.uk>2015-02-10 10:55:33 (GMT)
committerRichard Ipsum <richard.ipsum@codethink.co.uk>2015-02-10 10:55:33 (GMT)
commit368c597250a244bab3208980c917c5cad83c30f4 (patch)
tree52ea47e7a2a30623eb403b7d447eada7e4e0fdb6
parent1495c702276989aa175a8f9471be53712cfd7d88 (diff)
parent42264f980b927b4f6739c84cca3a382de1edbb95 (diff)
downloaddefinitions-368c597250a244bab3208980c917c5cad83c30f4.tar.gz
Merge branch 'baserock/richardipsum/python-pkg-shuffle'
Reviewed by: Mike Smith <mike.smith@codethink.co.uk> Sam Thursfield <sam.thursfield@codethink.co.uk> Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
-rw-r--r--strata/openstack-clients.morph9
-rw-r--r--strata/python-core.morph17
-rw-r--r--strata/python-tools.morph8
-rw-r--r--systems/ceph-service-x86_64-generic.morph4
-rw-r--r--systems/devel-system-armv7-chroot.morph2
-rw-r--r--systems/devel-system-armv7-highbank.morph2
-rw-r--r--systems/devel-system-armv7-versatile.morph2
-rw-r--r--systems/devel-system-armv7-wandboard.morph2
-rw-r--r--systems/devel-system-armv7b-chroot.morph2
-rw-r--r--systems/devel-system-armv7b-highbank.morph2
-rw-r--r--systems/devel-system-armv7lhf-chroot.morph2
-rw-r--r--systems/devel-system-armv7lhf-highbank.morph2
-rw-r--r--systems/devel-system-armv7lhf-jetson.morph2
-rw-r--r--systems/devel-system-armv7lhf-wandboard.morph2
-rw-r--r--systems/devel-system-ppc64-chroot.morph2
-rw-r--r--systems/devel-system-ppc64-generic.morph2
-rw-r--r--systems/devel-system-x86_32-chroot.morph2
-rw-r--r--systems/devel-system-x86_32-generic.morph2
-rw-r--r--systems/devel-system-x86_64-chroot.morph2
-rw-r--r--systems/devel-system-x86_64-generic.morph2
-rw-r--r--systems/devel-system-x86_64-vagrant.morph2
21 files changed, 58 insertions, 14 deletions
diff --git a/strata/openstack-clients.morph b/strata/openstack-clients.morph
index 616a876..c477521 100644
--- a/strata/openstack-clients.morph
+++ b/strata/openstack-clients.morph
@@ -2,6 +2,7 @@ name: openstack-clients
kind: stratum
description: A stratum with OpenStack clients, for OpenStack deployments.
build-depends:
+- morph: strata/python-core.morph
- morph: strata/tools.morph
chunks:
- name: jsonschema
@@ -33,11 +34,6 @@ chunks:
ref: 941133673e5a0003cd5ce1b6db2a51cf3307d9c1
unpetrify-ref: baserock/morph
build-depends: []
-- name: pbr
- repo: upstream:pbr
- ref: 510ee9e9dcb94c5884c215fa3535a1f77f3d2a51
- unpetrify-ref: baserock/morph
- build-depends: []
- name: argparse
repo: upstream:argparse
ref: c9b3f9b32949cb7dd798e7d1aedbeeef064aa4b1
@@ -85,7 +81,6 @@ chunks:
ref: 21cc66a850c5ea1d2ffffb655da0c452b919ed3b
unpetrify-ref: baserock/morph
build-depends:
- - pbr
- pyiso8601
- python-prettytable
- python-requests
@@ -98,7 +93,6 @@ chunks:
unpetrify-ref: baserock/morph
build-depends:
- python-prettytable
- - pbr
- argparse
- pyopenssl
- python-keystoneclient
@@ -109,7 +103,6 @@ chunks:
unpetrify-ref: baserock/morph
build-depends:
- python-prettytable
- - pbr
- argparse
- pyiso8601
- python-requests
diff --git a/strata/python-core.morph b/strata/python-core.morph
new file mode 100644
index 0000000..a76262f
--- /dev/null
+++ b/strata/python-core.morph
@@ -0,0 +1,17 @@
+name: python-core
+kind: stratum
+description: Core python packages
+build-depends:
+- morph: strata/core.morph
+chunks:
+- name: pip
+ repo: upstream:pip
+ ref: ea680f204fb0e48789710c22c8f597a9bf01bc16
+ unpetrify-ref: baserock/master
+ build-depends: []
+- name: pbr
+ repo: upstream:pbr
+ ref: aef4f7ef4faec987d553d1ca40b55951235af0b1
+ unpetrify-ref: 0.10.7
+ build-depends:
+ - pip
diff --git a/strata/python-tools.morph b/strata/python-tools.morph
index 0a707bc..d1ce912 100644
--- a/strata/python-tools.morph
+++ b/strata/python-tools.morph
@@ -5,8 +5,8 @@ useful python tools that we don't want to include in core."
build-depends:
- morph: strata/core.morph
chunks:
-- name: pip
- repo: upstream:pip
- ref: ea680f204fb0e48789710c22c8f597a9bf01bc16
- unpetrify-ref: baserock/master
+- name: virtualenv
+ repo: upstream:python-packages/virtualenv
+ ref: 9205ff46a67130e8835f14bb4f802fd59e7dcf2c
+ unpetrify-ref: 12.0.5
build-depends: []
diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph
index 509bd38..b03d165 100644
--- a/systems/ceph-service-x86_64-generic.morph
+++ b/systems/ceph-service-x86_64-generic.morph
@@ -36,8 +36,8 @@ strata:
morph: strata/baserock-import.morph
- name: nfs
morph: strata/nfs.morph
-- name: python-tools
- morph: strata/python-tools.morph
+- name: python-core
+ morph: strata/python-core.morph
- name: chef
morph: strata/chef.morph
configuration-extensions:
diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph
index 305f7a2..de474c8 100644
--- a/systems/devel-system-armv7-chroot.morph
+++ b/systems/devel-system-armv7-chroot.morph
@@ -27,6 +27,8 @@ strata:
morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
+- name: python-core
+ morph: strata/python-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: devtools
diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph
index 427dbb3..2cce69d 100644
--- a/systems/devel-system-armv7-highbank.morph
+++ b/systems/devel-system-armv7-highbank.morph
@@ -30,6 +30,8 @@ strata:
morph: strata/baserock-import.morph
- name: nfs
morph: strata/nfs.morph
+- name: python-core
+ morph: strata/python-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: devtools
diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph
index 1529522..3880642 100644
--- a/systems/devel-system-armv7-versatile.morph
+++ b/systems/devel-system-armv7-versatile.morph
@@ -30,6 +30,8 @@ strata:
morph: strata/baserock-import.morph
- name: nfs
morph: strata/nfs.morph
+- name: python-core
+ morph: strata/python-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: devtools
diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph
index 0f6aef5..c47be83 100644
--- a/systems/devel-system-armv7-wandboard.morph
+++ b/systems/devel-system-armv7-wandboard.morph
@@ -30,6 +30,8 @@ strata:
morph: strata/baserock-import.morph
- name: nfs
morph: strata/nfs.morph
+- name: python-core
+ morph: strata/python-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: devtools
diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph
index 2b43bf6..64d7535 100644
--- a/systems/devel-system-armv7b-chroot.morph
+++ b/systems/devel-system-armv7b-chroot.morph
@@ -21,6 +21,8 @@ strata:
morph: strata/openstack-clients.morph
- name: baserock-import
morph: strata/baserock-import.morph
+- name: python-core
+ morph: strata/python-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: devtools
diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph
index 2e342fc..3a84d17 100644
--- a/systems/devel-system-armv7b-highbank.morph
+++ b/systems/devel-system-armv7b-highbank.morph
@@ -24,6 +24,8 @@ strata:
morph: strata/baserock-import.morph
- name: nfs
morph: strata/nfs.morph
+- name: python-core
+ morph: strata/python-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: devtools
diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph
index c50468a..2e4b83b 100644
--- a/systems/devel-system-armv7lhf-chroot.morph
+++ b/systems/devel-system-armv7lhf-chroot.morph
@@ -27,6 +27,8 @@ strata:
morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
+- name: python-core
+ morph: strata/python-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: devtools
diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph
index 4bae3ac..17f8bcb 100644
--- a/systems/devel-system-armv7lhf-highbank.morph
+++ b/systems/devel-system-armv7lhf-highbank.morph
@@ -31,6 +31,8 @@ strata:
morph: strata/baserock-import.morph
- name: nfs
morph: strata/nfs.morph
+- name: python-core
+ morph: strata/python-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: devtools
diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph
index e542f06..c09caf9 100644
--- a/systems/devel-system-armv7lhf-jetson.morph
+++ b/systems/devel-system-armv7lhf-jetson.morph
@@ -31,6 +31,8 @@ strata:
morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
+- name: python-core
+ morph: strata/python-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: devtools
diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph
index cda52c3..ffa9edd 100644
--- a/systems/devel-system-armv7lhf-wandboard.morph
+++ b/systems/devel-system-armv7lhf-wandboard.morph
@@ -31,6 +31,8 @@ strata:
morph: strata/baserock-import.morph
- name: nfs
morph: strata/nfs.morph
+- name: python-core
+ morph: strata/python-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: devtools
diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph
index c491857..9e575d5 100644
--- a/systems/devel-system-ppc64-chroot.morph
+++ b/systems/devel-system-ppc64-chroot.morph
@@ -25,6 +25,8 @@ strata:
morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
+- name: python-core
+ morph: strata/python-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: devtools
diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph
index a53a6a5..d92da0f 100644
--- a/systems/devel-system-ppc64-generic.morph
+++ b/systems/devel-system-ppc64-generic.morph
@@ -28,6 +28,8 @@ strata:
morph: strata/baserock-import.morph
- name: nfs
morph: strata/nfs.morph
+- name: python-core
+ morph: strata/python-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: devtools
diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph
index 83e5531..3578c22 100644
--- a/systems/devel-system-x86_32-chroot.morph
+++ b/systems/devel-system-x86_32-chroot.morph
@@ -29,6 +29,8 @@ strata:
morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
+- name: python-core
+ morph: strata/python-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: devtools
diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph
index 3ad441c..b53d6d9 100644
--- a/systems/devel-system-x86_32-generic.morph
+++ b/systems/devel-system-x86_32-generic.morph
@@ -32,6 +32,8 @@ strata:
morph: strata/baserock-import.morph
- name: nfs
morph: strata/nfs.morph
+- name: python-core
+ morph: strata/python-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: devtools
diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph
index 569a00d..aa8d6a1 100644
--- a/systems/devel-system-x86_64-chroot.morph
+++ b/systems/devel-system-x86_64-chroot.morph
@@ -29,6 +29,8 @@ strata:
morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
+- name: python-core
+ morph: strata/python-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: devtools
diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph
index 32ddfc5..c071b3e 100644
--- a/systems/devel-system-x86_64-generic.morph
+++ b/systems/devel-system-x86_64-generic.morph
@@ -32,6 +32,8 @@ strata:
morph: strata/baserock-import.morph
- name: nfs
morph: strata/nfs.morph
+- name: python-core
+ morph: strata/python-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: devtools
diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph
index 7ffddc0..c104b29 100644
--- a/systems/devel-system-x86_64-vagrant.morph
+++ b/systems/devel-system-x86_64-vagrant.morph
@@ -30,6 +30,8 @@ strata:
morph: strata/lorry.morph
- name: baserock-import
morph: strata/baserock-import.morph
+- name: python-core
+ morph: strata/python-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: devtools