diff options
author | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2015-02-10 10:55:33 +0000 |
---|---|---|
committer | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2015-02-10 10:55:33 +0000 |
commit | 368c597250a244bab3208980c917c5cad83c30f4 (patch) | |
tree | 52ea47e7a2a30623eb403b7d447eada7e4e0fdb6 /systems | |
parent | 1495c702276989aa175a8f9471be53712cfd7d88 (diff) | |
parent | 42264f980b927b4f6739c84cca3a382de1edbb95 (diff) | |
download | definitions-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>
Diffstat (limited to 'systems')
-rw-r--r-- | systems/ceph-service-x86_64-generic.morph | 4 | ||||
-rw-r--r-- | systems/devel-system-armv7-chroot.morph | 2 | ||||
-rw-r--r-- | systems/devel-system-armv7-highbank.morph | 2 | ||||
-rw-r--r-- | systems/devel-system-armv7-versatile.morph | 2 | ||||
-rw-r--r-- | systems/devel-system-armv7-wandboard.morph | 2 | ||||
-rw-r--r-- | systems/devel-system-armv7b-chroot.morph | 2 | ||||
-rw-r--r-- | systems/devel-system-armv7b-highbank.morph | 2 | ||||
-rw-r--r-- | systems/devel-system-armv7lhf-chroot.morph | 2 | ||||
-rw-r--r-- | systems/devel-system-armv7lhf-highbank.morph | 2 | ||||
-rw-r--r-- | systems/devel-system-armv7lhf-jetson.morph | 2 | ||||
-rw-r--r-- | systems/devel-system-armv7lhf-wandboard.morph | 2 | ||||
-rw-r--r-- | systems/devel-system-ppc64-chroot.morph | 2 | ||||
-rw-r--r-- | systems/devel-system-ppc64-generic.morph | 2 | ||||
-rw-r--r-- | systems/devel-system-x86_32-chroot.morph | 2 | ||||
-rw-r--r-- | systems/devel-system-x86_32-generic.morph | 2 | ||||
-rw-r--r-- | systems/devel-system-x86_64-chroot.morph | 2 | ||||
-rw-r--r-- | systems/devel-system-x86_64-generic.morph | 2 | ||||
-rw-r--r-- | systems/devel-system-x86_64-vagrant.morph | 2 |
18 files changed, 36 insertions, 2 deletions
diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph index 509bd383..b03d1653 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 305f7a22..de474c87 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 427dbb3f..2cce69d3 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 1529522c..38806421 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 0f6aef58..c47be836 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 2b43bf65..64d75350 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 2e342fc3..3a84d178 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 c50468a9..2e4b83bd 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 4bae3ac8..17f8bcbb 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 e542f067..c09caf96 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 cda52c36..ffa9edd4 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 c4918572..9e575d5d 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 a53a6a56..d92da0fd 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 83e55316..3578c221 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 3ad441ca..b53d6d93 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 569a00d8..aa8d6a1c 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 32ddfc56..c071b3ea 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 7ffddc02..c104b29b 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 |