From 39da44e5d7ba8205925bb10f0cfb4d48384b483c Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Fri, 20 Feb 2015 10:11:27 +0000
Subject: Move Ansible dependencies to python-common.morph

This dependencies are needed for some Openstack components, and this
will avoid duplication once this work is done.
---
 strata/ansible.morph                         | 35 ++--------------------------
 strata/python-common.morph                   | 35 ++++++++++++++++++++++++++++
 systems/build-system-armv7lhf-highbank.morph |  2 ++
 systems/build-system-armv7lhf-jetson.morph   |  2 ++
 systems/build-system-armv8l64.morph          |  2 ++
 systems/build-system-ppc64.morph             |  2 ++
 systems/build-system-x86_32-chroot.morph     |  2 ++
 systems/build-system-x86_32.morph            |  2 ++
 systems/build-system-x86_64-chroot.morph     |  2 ++
 systems/build-system-x86_64.morph            |  2 ++
 systems/trove-system-x86_64.morph            |  2 ++
 11 files changed, 55 insertions(+), 33 deletions(-)
 create mode 100644 strata/python-common.morph

diff --git a/strata/ansible.morph b/strata/ansible.morph
index 0d8cab0f..0647f742 100644
--- a/strata/ansible.morph
+++ b/strata/ansible.morph
@@ -3,42 +3,11 @@ kind: stratum
 description: A stratum with ansible and its dependencies
 build-depends:
 - morph: strata/core.morph
-- morph: strata/python-core.morph
+- morph: strata/python-common.morph
 chunks:
-- name: pycrypto
-  morph: strata/openstack-services/pycrypto.morph
-  repo: upstream:python-packages/pycrypto
-  ref: af058ee6f5da391a05275470ab4a4a96aa22b350
-  unpetrify-ref: v2.7a1
-  build-depends: []
-- name: ecdsa
-  repo: upstream:python-packages/ecdsa
-  ref: 36e9cfa80fcf8b53119adc787e54a5892ec1eb2c
-  unpetrify-ref: python-ecdsa-0.11
-  build-depends: []
-- name: paramiko
-  repo: upstream:paramiko
-  ref: 424ba615c2a94d3b059e7f24db1a1093a92d8d22
-  unpetrify-ref: v1.15.2
-  build-depends:
-  - pycrypto
-  - ecdsa
-- name: markupsafe
-  repo: upstream:markupsafe
-  ref: feb1d70c16df62f60dcb521d127fdad8819fc036
-  unpetrify-ref: 0.23
-  build-depends: []
-- name: jinja2
-  repo: upstream:jinja2
-  ref: 762c612e7276889aac265645da00e62e33d1573c
-  unpetrify-ref: 2.7.3
-  build-depends:
-  - markupsafe
 - name: ansible
   morph: strata/ansible/ansible.morph
   repo: upstream:ansible
   ref: ebc8d48d34296fe010096f044e2b7591df37a622
   unpetrify-ref: baserock/pedroalvarez/v1.8.4
-  build-depends:
-  - paramiko
-  - jinja2
+  build-depends: []
diff --git a/strata/python-common.morph b/strata/python-common.morph
new file mode 100644
index 00000000..5536e13c
--- /dev/null
+++ b/strata/python-common.morph
@@ -0,0 +1,35 @@
+name: python-common
+kind: stratum
+description: Common dependencies of some python chunks
+build-depends:
+- morph: strata/python-core.morph
+chunks:
+- name: pycrypto
+  morph: strata/openstack-services/pycrypto.morph
+  repo: upstream:python-packages/pycrypto
+  ref: af058ee6f5da391a05275470ab4a4a96aa22b350
+  unpetrify-ref: v2.7a1
+  build-depends: []
+- name: ecdsa
+  repo: upstream:python-packages/ecdsa
+  ref: 36e9cfa80fcf8b53119adc787e54a5892ec1eb2c
+  unpetrify-ref: python-ecdsa-0.11
+  build-depends: []
+- name: paramiko
+  repo: upstream:paramiko
+  ref: 424ba615c2a94d3b059e7f24db1a1093a92d8d22
+  unpetrify-ref: v1.15.2
+  build-depends:
+  - pycrypto
+  - ecdsa
+- name: markupsafe
+  repo: upstream:markupsafe
+  ref: feb1d70c16df62f60dcb521d127fdad8819fc036
+  unpetrify-ref: 0.23
+  build-depends: []
+- name: jinja2
+  repo: upstream:jinja2
+  ref: 762c612e7276889aac265645da00e62e33d1573c
+  unpetrify-ref: 2.7.3
+  build-depends:
+  - markupsafe
diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph
index cf37f5e6..50c98a1b 100644
--- a/systems/build-system-armv7lhf-highbank.morph
+++ b/systems/build-system-armv7lhf-highbank.morph
@@ -19,6 +19,8 @@ strata:
   morph: strata/morph-utils.morph
 - name: nfs
   morph: strata/nfs.morph
+- name: python-common
+  morph: strata/python-common.morph
 - name: ansible
   morph: strata/ansible.morph
 - name: cloudinit-support
diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph
index 846681a2..cc4c9bf9 100644
--- a/systems/build-system-armv7lhf-jetson.morph
+++ b/systems/build-system-armv7lhf-jetson.morph
@@ -19,6 +19,8 @@ strata:
   morph: strata/morph-utils.morph
 - name: nfs
   morph: strata/nfs.morph
+- name: python-common
+  morph: strata/python-common.morph
 - name: ansible
   morph: strata/ansible.morph
 - name: cloudinit-support
diff --git a/systems/build-system-armv8l64.morph b/systems/build-system-armv8l64.morph
index 15b0a52c..7715ecb7 100644
--- a/systems/build-system-armv8l64.morph
+++ b/systems/build-system-armv8l64.morph
@@ -20,6 +20,8 @@ strata:
   morph: strata/morph-utils.morph
 - name: nfs
   morph: strata/nfs.morph
+- name: python-common
+  morph: strata/python-common.morph
 - name: ansible
   morph: strata/ansible.morph
 - name: cloudinit-support
diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph
index 8be51f90..fb95e303 100644
--- a/systems/build-system-ppc64.morph
+++ b/systems/build-system-ppc64.morph
@@ -19,6 +19,8 @@ strata:
   morph: strata/morph-utils.morph
 - name: nfs
   morph: strata/nfs.morph
+- name: python-common
+  morph: strata/python-common.morph
 - name: ansible
   morph: strata/ansible.morph
 - name: cloudinit-support
diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph
index f74ce07d..de63e327 100644
--- a/systems/build-system-x86_32-chroot.morph
+++ b/systems/build-system-x86_32-chroot.morph
@@ -17,6 +17,8 @@ strata:
   morph: strata/morph-utils.morph
 - name: nfs
   morph: strata/nfs.morph
+- name: python-common
+  morph: strata/python-common.morph
 - name: ansible
   morph: strata/ansible.morph
 - name: cloudinit-support
diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph
index 5bbe38f8..e1ebf4e3 100644
--- a/systems/build-system-x86_32.morph
+++ b/systems/build-system-x86_32.morph
@@ -19,6 +19,8 @@ strata:
   morph: strata/morph-utils.morph
 - name: nfs
   morph: strata/nfs.morph
+- name: python-common
+  morph: strata/python-common.morph
 - name: ansible
   morph: strata/ansible.morph
 - name: cloudinit-support
diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph
index 1ca20c00..29580d96 100644
--- a/systems/build-system-x86_64-chroot.morph
+++ b/systems/build-system-x86_64-chroot.morph
@@ -17,6 +17,8 @@ strata:
   morph: strata/morph-utils.morph
 - name: nfs
   morph: strata/nfs.morph
+- name: python-common
+  morph: strata/python-common.morph
 - name: ansible
   morph: strata/ansible.morph
 - name: cloudinit-support
diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph
index 2bf25493..59ccc23d 100644
--- a/systems/build-system-x86_64.morph
+++ b/systems/build-system-x86_64.morph
@@ -19,6 +19,8 @@ strata:
   morph: strata/morph-utils.morph
 - name: nfs
   morph: strata/nfs.morph
+- name: python-common
+  morph: strata/python-common.morph
 - name: ansible
   morph: strata/ansible.morph
 - name: cloudinit-support
diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph
index 580f53f7..93710a51 100644
--- a/systems/trove-system-x86_64.morph
+++ b/systems/trove-system-x86_64.morph
@@ -27,6 +27,8 @@ strata:
   morph: strata/lighttpd-server.morph
 - name: nfs
   morph: strata/nfs.morph
+- name: python-common
+  morph: strata/python-common.morph
 - name: ansible
   morph: strata/ansible.morph
 - name: cloudinit-support
-- 
cgit v1.2.1