summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-02-20 10:11:27 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-02-26 17:49:48 (GMT)
commit39da44e5d7ba8205925bb10f0cfb4d48384b483c (patch)
tree2279daf1ec92c6a0114eaa12064115ef2acd8f5c
parent7d4430c56a11bd920c91dc5c5996cd004a8f4c0b (diff)
downloaddefinitions-baserock/pedroalvarez/upgrade-ansible.tar.gz
Move Ansible dependencies to python-common.morphbaserock/pedroalvarez/upgrade-ansible
This dependencies are needed for some Openstack components, and this will avoid duplication once this work is done.
-rw-r--r--strata/ansible.morph35
-rw-r--r--strata/python-common.morph35
-rw-r--r--systems/build-system-armv7lhf-highbank.morph2
-rw-r--r--systems/build-system-armv7lhf-jetson.morph2
-rw-r--r--systems/build-system-armv8l64.morph2
-rw-r--r--systems/build-system-ppc64.morph2
-rw-r--r--systems/build-system-x86_32-chroot.morph2
-rw-r--r--systems/build-system-x86_32.morph2
-rw-r--r--systems/build-system-x86_64-chroot.morph2
-rw-r--r--systems/build-system-x86_64.morph2
-rw-r--r--systems/trove-system-x86_64.morph2
11 files changed, 55 insertions, 33 deletions
diff --git a/strata/ansible.morph b/strata/ansible.morph
index 0d8cab0..0647f74 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 0000000..5536e13
--- /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 cf37f5e..50c98a1 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 846681a..cc4c9bf 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 15b0a52..7715ecb 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 8be51f9..fb95e30 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 f74ce07..de63e32 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 5bbe38f..e1ebf4e 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 1ca20c0..29580d9 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 2bf2549..59ccc23 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 580f53f..93710a5 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