diff options
author | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-03-03 16:57:22 +0000 |
---|---|---|
committer | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-03-03 16:57:22 +0000 |
commit | 6cf64f572b2af6c6cb0586f4b5c6431b24025c34 (patch) | |
tree | fbb05bbbd912386fd0a96a11bf043f6be10f5234 | |
parent | 6980a9c1bb7d232a119de55788b68f283df29c9f (diff) | |
parent | 284d1dccd2fe49b890ea736b4f1038f7f7fba39e (diff) | |
download | definitions-6cf64f572b2af6c6cb0586f4b5c6431b24025c34.tar.gz |
Merge branch 'baserock/franred/actualize-openstack-clients'
Reviewed-by: Sam Thursfield <sam.thursfield@codethink.co.uk>
Reviewed-by: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
35 files changed, 345 insertions, 112 deletions
diff --git a/strata/cloudinit-support.morph b/strata/cloudinit-support.morph index 535beef6..5281b745 100644 --- a/strata/cloudinit-support.morph +++ b/strata/cloudinit-support.morph @@ -4,6 +4,7 @@ description: A stratum with cloudinit to fit a system in the OpenStack cloud. build-depends: - morph: strata/build-essential.morph - morph: strata/python-core.morph +- morph: strata/python-common.morph - morph: strata/foundation.morph chunks: - name: configobj @@ -11,23 +12,6 @@ chunks: ref: 935a78736e4eb43b9fafae87f5e9902328673f63 unpetrify-ref: baserock/morph build-depends: [] -- name: python-prettytable - morph: strata/cloudinit-support/python-prettytable.morph - repo: upstream:python-prettytable - ref: 941133673e5a0003cd5ce1b6db2a51cf3307d9c1 - unpetrify-ref: baserock/morph - build-depends: [] -- name: python-json-patch - repo: upstream:python-json-patch - ref: 27c7032de25923593fa17cc14f535fb7abd52448 - unpetrify-ref: baserock/morph - build-depends: [] -- name: python-json-pointer - repo: upstream:python-json-pointer - ref: 48dce313141ba5bf0d2f3dd2e590042c05755e53 - unpetrify-ref: baserock/morph - build-depends: - - python-json-patch - name: python-cheetah repo: upstream:python-cheetah ref: 831aa6b99d9b4fb012ee644d8e80e0bc0eb6d6ed @@ -46,6 +30,4 @@ chunks: build-depends: - boto - configobj - - python-prettytable - - python-json-pointer - python-cheetah diff --git a/strata/cloudinit-support/python-prettytable.morph b/strata/cloudinit-support/python-prettytable.morph deleted file mode 100644 index cf1ac6e1..00000000 --- a/strata/cloudinit-support/python-prettytable.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: python-prettytable -kind: chunk -build-commands: -- cd src && python setup.py build -install-commands: -- cd src && python setup.py install --prefix "$PREFIX" --root "$DESTDIR" diff --git a/strata/openstack-clients.morph b/strata/openstack-clients.morph index 1b348630..a4eb0ce0 100644 --- a/strata/openstack-clients.morph +++ b/strata/openstack-clients.morph @@ -1,103 +1,116 @@ name: openstack-clients kind: stratum -description: A stratum with OpenStack clients, for OpenStack deployments. +description: Stratum with all the OpenStack clients and their dependencies. build-depends: -- morph: strata/python-core.morph -- morph: strata/tools.morph +- morph: strata/openstack-common.morph chunks: -- name: jsonschema - repo: upstream:jsonschema - ref: 292a256b918af1e567982bb801c427cf4ca5b9fe - unpetrify-ref: baserock/morph - build-depends: [] - name: python-json-pointer repo: upstream:python-json-pointer - ref: 48dce313141ba5bf0d2f3dd2e590042c05755e53 - unpetrify-ref: baserock/morph + ref: 34073e561261cb413b9bdff5beac31b070d98ea2 + unpetrify-ref: v1.4 build-depends: [] - name: python-json-patch repo: upstream:python-json-patch - ref: 27c7032de25923593fa17cc14f535fb7abd52448 - unpetrify-ref: baserock/morph - build-depends: [] + ref: e4da658a5dc9f68d3386017ffdcc8e07d22b51a3 + unpetrify-ref: v1.8 + build-depends: + - python-json-pointer - name: warlock repo: upstream:warlock - ref: 1a0de8a67df8282c42f71014cc871684e8d7c0cf - unpetrify-ref: baserock/morph + ref: 408ccb82347aabf3dc7cf6eccbd2ed2475cb0d60 + unpetrify-ref: 1.1.0 build-depends: - - jsonschema - python-json-pointer - - python-json-patch -- name: python-prettytable - morph: strata/openstack-clients/python-prettytable.morph - repo: upstream:python-prettytable - ref: 941133673e5a0003cd5ce1b6db2a51cf3307d9c1 - unpetrify-ref: baserock/morph build-depends: [] -- name: argparse - repo: upstream:argparse - ref: c9b3f9b32949cb7dd798e7d1aedbeeef064aa4b1 - unpetrify-ref: baserock/morph - build-depends: [] -- name: pyopenssl - repo: upstream:pyopenssl - ref: 6bbf44a00b35fb28df1f66aa194b2fe95eab1ab2 - unpetrify-ref: baserock/morph - build-depends: [] -- name: pyiso8601 - repo: upstream:pyiso8601 - ref: ac5470ec9e68332ebc499c4f9f21e7e3cb31ecb6 - unpetrify-ref: baserock/morph +- name: python-keystoneclient + repo: upstream:openstack/python-keystoneclient + ref: 79d1eec35aad874a7c08ff22c39260884a5524ba + unpetrify-ref: 0.11.1 build-depends: [] -- name: simplejson - repo: upstream:simplejson - ref: 35816bfe2d0ddeb5ddcc68239683cbb35b7e3ff2 - unpetrify-ref: baserock/morph +- name: python-glanceclient + repo: upstream:openstack/python-glanceclient + ref: 8a877b2752162d6a2db43d7d61d6311c4f42285b + unpetrify-ref: 0.14.1 + build-depends: + - python-keystoneclient + - warlock +- name: python-novaclient + repo: upstream:openstack/python-novaclient + ref: 5ecfdac6b34769e200ff5c4c7429c20518c5b24f + unpetrify-ref: 2.20.0 + build-depends: + - python-keystoneclient +- name: python-swiftclient + repo: upstream:openstack/python-swiftclient + ref: bb4d2ab59c4de9389667eeed255642f51e276f1e + unpetrify-ref: 2.3.1 build-depends: [] -- name: netaddr - repo: upstream:netaddr - ref: f64ae19e533ffa5522dcba1fc833975cb2ee88a5 - unpetrify-ref: baserock/morph +- name: python-troveclient + repo: upstream:openstack/python-troveclient + ref: e010a919750f07493afd42a4db867853b925bcbf + unpetrify-ref: 1.0.7 build-depends: [] -- name: pytz - morph: strata/openstack-clients/pytz.morph - repo: upstream:pytz - ref: 384207f01fd5b8bf1eb20cb64c17679084731944 - unpetrify-ref: baserock/morph +- name: python-cinderclient + repo: upstream:openstack/python-cinderclient + ref: ac9b0913904c43f4bf12c8164324d6e6a55dc1ab + unpetrify-ref: 1.1.1 + build-depends: + - python-keystoneclient +- name: pyparsing + morph: strata/openstack-clients/pyparsing.morph + repo: upstream:python-packages/pyparsing.git + ref: 8062c76ab3958a570052124f17e71f3dd3ec2257 + unpetrify-ref: pyparsing_2.0.3 build-depends: [] -- name: babel - repo: upstream:babel - ref: d764b35bc3910b8f67ff811752df615afa7667f6 - unpetrify-ref: baserock/morph +- name: cmd2 + repo: upstream:python-packages/cmd2.git + ref: 07b4dc3d6991cbdc420c246e807371c97a467d1a + unpetrify-ref: master build-depends: - - pytz -- name: python-keystoneclient - repo: upstream:python-keystoneclient - ref: 21cc66a850c5ea1d2ffffb655da0c452b919ed3b - unpetrify-ref: baserock/morph + - pyparsing +- name: cliff + repo: upstream:openstack/cliff + ref: 42675b2d7ad93f4bba9c4216874c68b8e5834147 + unpetrify-ref: 1.7.0 build-depends: - - pyiso8601 - - python-prettytable - - simplejson - - netaddr - - babel -- name: python-glanceclient - repo: upstream:python-glanceclient - ref: 721660612df4454726b723daf902abd23ba0109c - unpetrify-ref: baserock/morph + - cmd2 + - pyparsing +- name: python-neutronclient + repo: upstream:openstack/python-neutronclient + ref: fa5642f1550bc8f818c1686c40edbaf3672d356a + unpetrify-ref: 2.3.9 build-depends: - - python-prettytable - - argparse - - pyopenssl + - cliff - python-keystoneclient - - warlock -- name: python-novaclient - repo: upstream:python-novaclient - ref: 9e4530c79e46d392ed8f3e413bca1acffe022fe6 - unpetrify-ref: baserock/morph +- name: python-ceilometerclient + repo: upstream:openstack/python-ceilometerclient + ref: 7316dd16b8850270db27c1298dcf5a2223f2f1e1 + unpetrify-ref: 1.0.12 + build-depends: + - python-keystoneclient +- name: python-heatclient + repo: upstream:openstack/python-heatclient + ref: 6089d31e302d80910cc15132f99a1bf358bbb64f + unpetrify-ref: 0.2.12 build-depends: - - python-prettytable - - argparse - - pyiso8601 - - simplejson - - babel + - python-keystoneclient +- name: python-designateclient + repo: upstream:openstack/python-designateclient + ref: a900b41e4d8a9eb40e1812295ba16d773e2b9618 + unpetrify-ref: 1.1.0 + build-depends: + - cliff + - python-keystoneclient +- name: python-barbicanclient + repo: upstream:openstack/python-barbicanclient.git + ref: ac30643631b6bc1c40116061f8eb280a7881e422 + unpetrify-ref: 2.2.1 + build-depends: + - python-keystoneclient + - cliff +- name: python-saharaclient + repo: upstream:openstack/python-saharaclient + ref: eadb40ccb62566f02cb93ec03aa232e48835dec3 + unpetrify-ref: 0.7.6 + build-depends: + - python-keystoneclient diff --git a/strata/openstack-clients/pytz.morph b/strata/openstack-clients/pyparsing.morph index f5557946..60088544 100644 --- a/strata/openstack-clients/pytz.morph +++ b/strata/openstack-clients/pyparsing.morph @@ -1,4 +1,4 @@ -name: pytz +name: pyparsing kind: chunk build-commands: - cd src && python setup.py build diff --git a/strata/openstack-clients/python-prettytable.morph b/strata/openstack-clients/python-prettytable.morph deleted file mode 100644 index cf1ac6e1..00000000 --- a/strata/openstack-clients/python-prettytable.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: python-prettytable -kind: chunk -build-commands: -- cd src && python setup.py build -install-commands: -- cd src && python setup.py install --prefix "$PREFIX" --root "$DESTDIR" diff --git a/strata/openstack-common.morph b/strata/openstack-common.morph new file mode 100644 index 00000000..df92a2c4 --- /dev/null +++ b/strata/openstack-common.morph @@ -0,0 +1,110 @@ +name: openstack-common +kind: stratum +description: | + Stratum with the python packages needed to compile openstack + clients and services. +build-depends: +- morph: strata/python-core.morph +- morph: strata/foundation.morph +chunks: +- name: pycparser + repo: upstream:python-packages/pycparser + ref: c926670643ebb5f88a2bf56579fc9934c82be6d2 + unpetrify-ref: master + build-depends: [] +- name: cffi + repo: upstream:python-packages/cffi + ref: fc53b53095d61a1ec5814c09c3bf2c7e18627fb5 + unpretrify-ref: master + build-depends: + - pycparser +- name: pytz + repo: upstream:pytz-tarball + ref: c414cb801776e11c769fb36c0d37b8d7a7c8712c + unpetrify-ref: pytz-2014.10 + build-depends: [] +- name: babel + repo: upstream:babel + ref: 246996b0ee51e49ebcd504e234d3bcdcb178996c + unpetrify-ref: master + build-depends: + - pytz +- name: enum34 + repo: upstream:python-packages/enum34.git + ref: f1fa1787ceaac72b9934f318ea2135d28c05dd55 + unpetrify-ref: enum34-1.0 + build-depends: [] +- name: pyasn1 + repo: upstream:python-packages/pyasn1 + ref: fa8e66c5f4367a1e39b53dcddc133d084b10400f + unpetrify-ref: release_0_1_7_tag + build-depends: [] +- name: cryptography + repo: upstream:python-packages/cryptography + ref: 9ac7d55150c8410a08ee3b00b89bfeac3dbd8e8f + unpetrify-ref: 0.7.2 + build-depends: + - pyasn1 + - enum34 + - cffi +- name: pyiso8601 + repo: upstream:pyiso8601 + ref: 9eb87a9bab114e9cc9a8d3dceb04362644d89cab + unpetrify-ref: 0.1.10 + build-depends: [] +- name: netaddr + repo: upstream:netaddr + ref: bbb31ed50a5338a7d1c0011fc4429d09954f9f0b + unpetrify-ref: release-0.7.12 + build-depends: [] +- name: stevedore + ref: 860bd8f8ecba38fdfda5b41a3a1dbe854d6528e2 + unpetrify-ref: 1.0.0.0a2 + repo: upstream:openstack/stevedore + build-depends: [] +- name: oslo-config + repo: upstream:openstack/oslo-config + ref: 059579ac2189b94bc9e9555b2e9acfb31a83ef53 + unpetrify-ref: 1.4.0.0a5 + build-depends: + - netaddr + - stevedore +- name: pyopenssl + repo: upstream:python-packages/pyopenssl + ref: 0146d447e63a737b4f05a1164d5950eff68543e7 + unpetrify-ref: 0.14 + build-depends: [] +- name: oslo-i18n + repo: upstream:openstack/oslo-i18n + ref: 040f1d6afa733527385d2309e485bf37e9843b0e + unpetrify-ref: 0.4.0 + build-depends: + - babel +- name: oslo-utils + repo: upstream:openstack/oslo-utils + ref: 6a123fce93895e92004ce9d5bd8dee3c3642cf41 + unpetrify-ref: 0.3.0 + build-depends: + - babel + - pyiso8601 + - oslo-i18n +- name: futures + repo: upstream:python-packages/futures + ref: 4f7ceedb8a7742e52b0436a4160c7c44665a2597 + unpetrify-ref: 2.2.0 + build-depends: [] +- name: oslo-serialization + repo: upstream:openstack/oslo-serialization.git + ref: 80fec894a54253d9b4c80dd8a563957966ca0b88 + unpetrify-ref: 0.3.0 + build-depends: [] +- name: jsonschema + repo: upstream:jsonschema + ref: 35b60f390098d3306c03eee27ceec8cf8a493579 + unpetrify-ref: v2.3.0 + build-depends: [] +- name: simplejson + repo: upstream:simplejson + ref: 54d5ff15d508c51366986cc4f77f2f287f036582 + unpetrify-ref: v3.6.4 + build-depends: [] diff --git a/strata/python-common.morph b/strata/python-common.morph index e2f4b32a..850ad720 100644 --- a/strata/python-common.morph +++ b/strata/python-common.morph @@ -33,3 +33,19 @@ chunks: unpetrify-ref: 2.7.3 build-depends: - markupsafe +- 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: python-prettytable + repo: upstream:python-prettytable + ref: 7a48f1e84049577370cf28632a75d2fd01e4142d + unpetrify-ref: master + build-depends: [] diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph index 50c98a1b..ae67387f 100644 --- a/systems/build-system-armv7lhf-highbank.morph +++ b/systems/build-system-armv7lhf-highbank.morph @@ -25,6 +25,8 @@ strata: morph: strata/ansible.morph - name: cloudinit-support morph: strata/cloudinit-support.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: devtools diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph index cc4c9bf9..ccdbea1a 100644 --- a/systems/build-system-armv7lhf-jetson.morph +++ b/systems/build-system-armv7lhf-jetson.morph @@ -25,6 +25,8 @@ strata: morph: strata/ansible.morph - name: cloudinit-support morph: strata/cloudinit-support.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: devtools diff --git a/systems/build-system-armv8l64.morph b/systems/build-system-armv8l64.morph index 2fcb1e8c..08802a00 100644 --- a/systems/build-system-armv8l64.morph +++ b/systems/build-system-armv8l64.morph @@ -28,6 +28,8 @@ strata: morph: strata/ansible.morph - name: cloudinit-support morph: strata/cloudinit-support.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: devtools diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph index fb95e303..7d3f475d 100644 --- a/systems/build-system-ppc64.morph +++ b/systems/build-system-ppc64.morph @@ -25,6 +25,8 @@ strata: morph: strata/ansible.morph - name: cloudinit-support morph: strata/cloudinit-support.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: devtools diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph index de63e327..33a1a4c9 100644 --- a/systems/build-system-x86_32-chroot.morph +++ b/systems/build-system-x86_32-chroot.morph @@ -23,6 +23,8 @@ strata: morph: strata/ansible.morph - name: cloudinit-support morph: strata/cloudinit-support.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: devtools diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph index e1ebf4e3..86d2b690 100644 --- a/systems/build-system-x86_32.morph +++ b/systems/build-system-x86_32.morph @@ -25,6 +25,8 @@ strata: morph: strata/ansible.morph - name: cloudinit-support morph: strata/cloudinit-support.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: devtools diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph index 29580d96..24263808 100644 --- a/systems/build-system-x86_64-chroot.morph +++ b/systems/build-system-x86_64-chroot.morph @@ -23,6 +23,8 @@ strata: morph: strata/ansible.morph - name: cloudinit-support morph: strata/cloudinit-support.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: devtools diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph index 59ccc23d..77f1860e 100644 --- a/systems/build-system-x86_64.morph +++ b/systems/build-system-x86_64.morph @@ -25,6 +25,8 @@ strata: morph: strata/ansible.morph - name: cloudinit-support morph: strata/cloudinit-support.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: devtools diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph index b03d1653..730c00d4 100644 --- a/systems/ceph-service-x86_64-generic.morph +++ b/systems/ceph-service-x86_64-generic.morph @@ -24,6 +24,8 @@ strata: morph: strata/ntpd.morph - name: morph-utils morph: strata/morph-utils.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: cloudinit-support @@ -38,6 +40,8 @@ strata: morph: strata/nfs.morph - name: python-core morph: strata/python-core.morph +- name: python-common + morph: strata/python-common.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 de474c87..74742a85 100644 --- a/systems/devel-system-armv7-chroot.morph +++ b/systems/devel-system-armv7-chroot.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: morph-utils morph: strata/morph-utils.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: nodejs @@ -31,8 +33,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph index 2cce69d3..69681f7b 100644 --- a/systems/devel-system-armv7-highbank.morph +++ b/systems/devel-system-armv7-highbank.morph @@ -34,8 +34,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph index 38806421..9ed68978 100644 --- a/systems/devel-system-armv7-versatile.morph +++ b/systems/devel-system-armv7-versatile.morph @@ -34,8 +34,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph index c47be836..940b7725 100644 --- a/systems/devel-system-armv7-wandboard.morph +++ b/systems/devel-system-armv7-wandboard.morph @@ -34,8 +34,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph index 64d75350..8b754254 100644 --- a/systems/devel-system-armv7b-chroot.morph +++ b/systems/devel-system-armv7b-chroot.morph @@ -25,8 +25,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph index 3a84d178..54eeeee7 100644 --- a/systems/devel-system-armv7b-highbank.morph +++ b/systems/devel-system-armv7b-highbank.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: morph-utils morph: strata/morph-utils.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: baserock-import @@ -28,8 +30,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph index 2e4b83bd..95212d57 100644 --- a/systems/devel-system-armv7lhf-chroot.morph +++ b/systems/devel-system-armv7lhf-chroot.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: morph-utils morph: strata/morph-utils.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: nodejs @@ -31,8 +33,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph index 17f8bcbb..5c987497 100644 --- a/systems/devel-system-armv7lhf-highbank.morph +++ b/systems/devel-system-armv7lhf-highbank.morph @@ -19,6 +19,8 @@ strata: morph: strata/tools.morph - name: morph-utils morph: strata/morph-utils.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: nodejs @@ -35,8 +37,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph index c09caf96..9cdc1270 100644 --- a/systems/devel-system-armv7lhf-jetson.morph +++ b/systems/devel-system-armv7lhf-jetson.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: morph-utils morph: strata/morph-utils.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: nfs @@ -35,8 +37,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph index ffa9edd4..b69b3b13 100644 --- a/systems/devel-system-armv7lhf-wandboard.morph +++ b/systems/devel-system-armv7lhf-wandboard.morph @@ -19,6 +19,8 @@ strata: morph: strata/tools.morph - name: morph-utils morph: strata/morph-utils.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: nodejs @@ -35,8 +37,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv8l64.morph b/systems/devel-system-armv8l64.morph index 88495e48..c4af1d17 100644 --- a/systems/devel-system-armv8l64.morph +++ b/systems/devel-system-armv8l64.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: morph-utils morph: strata/morph-utils.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: cloudinit-support @@ -34,8 +36,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph index 9e575d5d..74d7e38e 100644 --- a/systems/devel-system-ppc64-chroot.morph +++ b/systems/devel-system-ppc64-chroot.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: morph-utils morph: strata/morph-utils.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: ruby @@ -29,8 +31,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph index d92da0fd..50cffd69 100644 --- a/systems/devel-system-ppc64-generic.morph +++ b/systems/devel-system-ppc64-generic.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: morph-utils morph: strata/morph-utils.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: ruby @@ -32,8 +34,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph index 3578c221..1ade237e 100644 --- a/systems/devel-system-x86_32-chroot.morph +++ b/systems/devel-system-x86_32-chroot.morph @@ -33,8 +33,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph index b53d6d93..de75a70a 100644 --- a/systems/devel-system-x86_32-generic.morph +++ b/systems/devel-system-x86_32-generic.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: morph-utils morph: strata/morph-utils.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: cloudinit-support @@ -36,8 +38,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph index aa8d6a1c..23db60c1 100644 --- a/systems/devel-system-x86_64-chroot.morph +++ b/systems/devel-system-x86_64-chroot.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: morph-utils morph: strata/morph-utils.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: bsp-x86_both-tools @@ -33,8 +35,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph index c071b3ea..46c7c4e5 100644 --- a/systems/devel-system-x86_64-generic.morph +++ b/systems/devel-system-x86_64-generic.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: morph-utils morph: strata/morph-utils.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: cloudinit-support @@ -36,8 +38,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph index c104b29b..ca0c717b 100644 --- a/systems/devel-system-x86_64-vagrant.morph +++ b/systems/devel-system-x86_64-vagrant.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: morph-utils morph: strata/morph-utils.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: virtualbox-guest-x86_64 @@ -34,8 +36,12 @@ strata: morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph +- name: python-common + morph: strata/python-common.morph - name: devtools morph: strata/devtools.morph +- name: ansible + morph: strata/ansible.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/gitlab-ci-runner.morph b/systems/gitlab-ci-runner.morph index 979b73b0..8f89ec74 100644 --- a/systems/gitlab-ci-runner.morph +++ b/systems/gitlab-ci-runner.morph @@ -31,10 +31,16 @@ strata: morph: strata/tools.morph - name: lvm morph: strata/lvm.morph +- name: python-core + morph: strata/python-core.morph - name: virtualization morph: strata/virtualization.morph +- name: openstack-common + morph: strata/openstack-common.morph - name: openstack-clients morph: strata/openstack-clients.morph +- name: python-common + morph: strata/python-common.morph - name: databases morph: strata/databases.morph - name: pcre-utils |