summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-03-10 13:48:22 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-03-12 15:32:08 +0000
commit2f91b8a0eeeb15469f3c5e1b104e34e88fe7df62 (patch)
tree5858f07da3d551cf3f33f78e85806a76e38e8a6d
parent0db32c56302cd8dda05372480cb3515181af65a1 (diff)
downloaddefinitions-2f91b8a0eeeb15469f3c5e1b104e34e88fe7df62.tar.gz
Move cliapp into its own 'python-cliapp' stratum
This allows us to have a system with Lorry and Lorry Controller but without Morph. Change-Id: I5164237601d0ff028834c674274f13b6e1f315c9
-rw-r--r--strata/baserock-import.morph3
-rw-r--r--strata/lorry-controller.morph2
-rw-r--r--strata/lorry.morph6
-rw-r--r--strata/morph-utils.morph22
-rw-r--r--strata/python-cliapp.morph24
-rw-r--r--strata/python-cliapp/python-coveragepy.morph (renamed from strata/morph-utils/python-coveragepy.morph)0
-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/ceph-service-x86_64-generic.morph2
-rw-r--r--systems/cross-bootstrap-system-armv7lhf-generic.morph2
-rw-r--r--systems/cross-bootstrap-system-armv8l64-generic.morph2
-rw-r--r--systems/cross-bootstrap-system-ppc64-generic.morph2
-rw-r--r--systems/cross-bootstrap-system-x86_64-generic.morph2
-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-armv8l64.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
-rw-r--r--systems/installer-system-x86_64.morph2
-rw-r--r--systems/trove-system-x86_64.morph2
-rw-r--r--systems/xfce-system.morph2
40 files changed, 98 insertions, 27 deletions
diff --git a/strata/baserock-import.morph b/strata/baserock-import.morph
index a3a195db..2b18d02d 100644
--- a/strata/baserock-import.morph
+++ b/strata/baserock-import.morph
@@ -2,7 +2,8 @@ name: baserock-import
kind: stratum
description: Tools for importing software into Baserock definitions.
build-depends:
-- morph: strata/morph-utils.morph
+- morph: strata/python-common.morph
+- morph: strata/python-cliapp.morph
chunks:
- name: ansicolor
repo: upstream:python-packages/ansicolor
diff --git a/strata/lorry-controller.morph b/strata/lorry-controller.morph
index 74ff75af..2d7076f9 100644
--- a/strata/lorry-controller.morph
+++ b/strata/lorry-controller.morph
@@ -6,7 +6,7 @@ description: |
This is a component of Trove, but can
also be used with other Git servers.
build-depends:
-- morph: strata/python-core.morph
+- morph: strata/python-cliapp.morph
chunks:
- name: lorry-controller
morph: strata/lorry-controller/lorry-controller.morph
diff --git a/strata/lorry.morph b/strata/lorry.morph
index 741bbc34..b3a0c779 100644
--- a/strata/lorry.morph
+++ b/strata/lorry.morph
@@ -10,10 +10,8 @@ description: |
The commandline tools 'hg', 'bzr', 'svn', and 'cvs' are also made available
by this stratum.
build-depends:
-# The 'morph-utils' stratum is required for 'cliapp', which Lorry needs at
-# build-time to generate its man page. Otherwise we could simply depend on
-# the 'foundation' stratum.
-- morph: strata/morph-utils.morph
+- morph: strata/foundation.morph
+- morph: strata/python-cliapp.morph
chunks:
- name: bzr-tarball
repo: upstream:bzr-tarball
diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph
index 80fce027..b5ba1df5 100644
--- a/strata/morph-utils.morph
+++ b/strata/morph-utils.morph
@@ -2,7 +2,7 @@ name: morph-utils
kind: stratum
build-depends:
- morph: strata/core.morph
-- morph: strata/python-core.morph
+- morph: strata/python-cliapp.morph
chunks:
- name: python-ttystatus
morph: strata/morph-utils/python-ttystatus.morph
@@ -23,30 +23,12 @@ chunks:
repo: upstream:pyfilesystem
ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6
unpetrify-ref: baserock/morph
-- name: python-coveragepy
- morph: strata/morph-utils/python-coveragepy.morph
- repo: upstream:python-coveragepy
- ref: 77d2e3bfd8fb325092aaed37ba1378054d182d19
- unpetrify-ref: baserock/morph
-- name: python-coverage-test-runner
- repo: upstream:python-coverage-test-runner
- ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7
- unpetrify-ref: baserock/morph
- build-depends:
- - python-coveragepy
-- name: cliapp
- repo: upstream:cliapp
- ref: cec20cedd062a3aef1b04f997e77b45090c07806
- unpetrify-ref: baserock/morph
- build-depends:
- - python-coverage-test-runner
- name: cmdtest
morph: strata/morph-utils/cmdtest.morph
repo: upstream:cmdtest
ref: ac91791842c6e7e6eda3213916af413255999c7b
unpetrify-ref: baserock/morph
build-depends:
- - cliapp
- python-ttystatus
- python-markdown
- name: bottle
@@ -66,9 +48,7 @@ chunks:
ref: 68395a12c79c22e266b4a06095533e38da6e29d0
unpetrify-ref: master
build-depends:
- - cliapp
- cmdtest
- - python-coverage-test-runner
- pyfilesystem
- bottle
- flup
diff --git a/strata/python-cliapp.morph b/strata/python-cliapp.morph
new file mode 100644
index 00000000..ff6fda3e
--- /dev/null
+++ b/strata/python-cliapp.morph
@@ -0,0 +1,24 @@
+name: python-cliapp
+kind: stratum
+description: |
+ Cliapp command line application framework.
+build-depends:
+- morph: strata/python-core.morph
+chunks:
+- name: python-coveragepy
+ morph: strata/morph-utils/python-coveragepy.morph
+ repo: upstream:python-coveragepy
+ ref: 77d2e3bfd8fb325092aaed37ba1378054d182d19
+ unpetrify-ref: baserock/morph
+- name: python-coverage-test-runner
+ repo: upstream:python-coverage-test-runner
+ ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - python-coveragepy
+- name: cliapp
+ repo: upstream:cliapp
+ ref: cec20cedd062a3aef1b04f997e77b45090c07806
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - python-coverage-test-runner
diff --git a/strata/morph-utils/python-coveragepy.morph b/strata/python-cliapp/python-coveragepy.morph
index ed5e3d87..ed5e3d87 100644
--- a/strata/morph-utils/python-coveragepy.morph
+++ b/strata/python-cliapp/python-coveragepy.morph
diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph
index ae67387f..4529354c 100644
--- a/systems/build-system-armv7lhf-highbank.morph
+++ b/systems/build-system-armv7lhf-highbank.morph
@@ -15,6 +15,8 @@ strata:
morph: strata/bsp-armv7-highbank.morph
- name: tools
morph: strata/tools.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: nfs
diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph
index ccdbea1a..ac227de2 100644
--- a/systems/build-system-armv7lhf-jetson.morph
+++ b/systems/build-system-armv7lhf-jetson.morph
@@ -15,6 +15,8 @@ strata:
morph: strata/bsp-jetson.morph
- name: tools
morph: strata/tools.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: nfs
diff --git a/systems/build-system-armv8l64.morph b/systems/build-system-armv8l64.morph
index 08802a00..3579efd4 100644
--- a/systems/build-system-armv8l64.morph
+++ b/systems/build-system-armv8l64.morph
@@ -18,6 +18,8 @@ strata:
morph: strata/bsp-armv8l64-generic.morph
- name: tools
morph: strata/tools.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: nfs
diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph
index 7d3f475d..09909535 100644
--- a/systems/build-system-ppc64.morph
+++ b/systems/build-system-ppc64.morph
@@ -15,6 +15,8 @@ strata:
morph: strata/bsp-ppc64-generic.morph
- name: tools
morph: strata/tools.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: nfs
diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph
index 33a1a4c9..f93cd574 100644
--- a/systems/build-system-x86_32-chroot.morph
+++ b/systems/build-system-x86_32-chroot.morph
@@ -13,6 +13,8 @@ strata:
morph: strata/python-core.morph
- name: tools
morph: strata/tools.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: nfs
diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph
index 86d2b690..909b025c 100644
--- a/systems/build-system-x86_32.morph
+++ b/systems/build-system-x86_32.morph
@@ -15,6 +15,8 @@ strata:
morph: strata/bsp-x86_32-generic.morph
- name: tools
morph: strata/tools.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: nfs
diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph
index 24263808..37b00e43 100644
--- a/systems/build-system-x86_64-chroot.morph
+++ b/systems/build-system-x86_64-chroot.morph
@@ -13,6 +13,8 @@ strata:
morph: strata/python-core.morph
- name: tools
morph: strata/tools.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: nfs
diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph
index 77f1860e..fc7164db 100644
--- a/systems/build-system-x86_64.morph
+++ b/systems/build-system-x86_64.morph
@@ -15,6 +15,8 @@ strata:
morph: strata/bsp-x86_64-generic.morph
- name: tools
morph: strata/tools.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: nfs
diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph
index 730c00d4..b58675fd 100644
--- a/systems/ceph-service-x86_64-generic.morph
+++ b/systems/ceph-service-x86_64-generic.morph
@@ -22,6 +22,8 @@ strata:
morph: strata/ruby.morph
- name: ntpd
morph: strata/ntpd.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: openstack-common
diff --git a/systems/cross-bootstrap-system-armv7lhf-generic.morph b/systems/cross-bootstrap-system-armv7lhf-generic.morph
index 23817c0c..f0a2780b 100644
--- a/systems/cross-bootstrap-system-armv7lhf-generic.morph
+++ b/systems/cross-bootstrap-system-armv7lhf-generic.morph
@@ -7,6 +7,8 @@ strata:
morph: strata/build-essential.morph
- name: core
morph: strata/core.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: cross-bootstrap
diff --git a/systems/cross-bootstrap-system-armv8l64-generic.morph b/systems/cross-bootstrap-system-armv8l64-generic.morph
index c35cff5f..2bf192d3 100644
--- a/systems/cross-bootstrap-system-armv8l64-generic.morph
+++ b/systems/cross-bootstrap-system-armv8l64-generic.morph
@@ -7,6 +7,8 @@ strata:
morph: strata/build-essential.morph
- name: core
morph: strata/core.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: cross-bootstrap
diff --git a/systems/cross-bootstrap-system-ppc64-generic.morph b/systems/cross-bootstrap-system-ppc64-generic.morph
index 40c80c00..9d736f94 100644
--- a/systems/cross-bootstrap-system-ppc64-generic.morph
+++ b/systems/cross-bootstrap-system-ppc64-generic.morph
@@ -7,6 +7,8 @@ strata:
morph: strata/build-essential.morph
- name: core
morph: strata/core.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: cross-bootstrap
diff --git a/systems/cross-bootstrap-system-x86_64-generic.morph b/systems/cross-bootstrap-system-x86_64-generic.morph
index 646a04d3..ac919d66 100644
--- a/systems/cross-bootstrap-system-x86_64-generic.morph
+++ b/systems/cross-bootstrap-system-x86_64-generic.morph
@@ -7,6 +7,8 @@ strata:
morph: strata/build-essential.morph
- name: core
morph: strata/core.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: cross-bootstrap
diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph
index 74742a85..c27dfd9d 100644
--- a/systems/devel-system-armv7-chroot.morph
+++ b/systems/devel-system-armv7-chroot.morph
@@ -15,6 +15,8 @@ strata:
morph: strata/foundation.morph
- name: tools
morph: strata/tools.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: openstack-common
diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph
index 69681f7b..f4720f40 100644
--- a/systems/devel-system-armv7-highbank.morph
+++ b/systems/devel-system-armv7-highbank.morph
@@ -16,6 +16,8 @@ strata:
morph: strata/bsp-armv7-highbank.morph
- name: tools
morph: strata/tools.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: openstack-clients
diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph
index 9ed68978..bda502e2 100644
--- a/systems/devel-system-armv7-versatile.morph
+++ b/systems/devel-system-armv7-versatile.morph
@@ -16,6 +16,8 @@ strata:
morph: strata/bsp-armv7-versatile.morph
- name: tools
morph: strata/tools.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: openstack-clients
diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph
index 940b7725..6cc1fd1d 100644
--- a/systems/devel-system-armv7-wandboard.morph
+++ b/systems/devel-system-armv7-wandboard.morph
@@ -16,6 +16,8 @@ strata:
morph: strata/bsp-wandboard.morph
- name: tools
morph: strata/tools.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: openstack-clients
diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph
index 8b754254..a2a061c3 100644
--- a/systems/devel-system-armv7b-chroot.morph
+++ b/systems/devel-system-armv7b-chroot.morph
@@ -15,6 +15,8 @@ strata:
morph: strata/foundation.morph
- name: tools
morph: strata/tools.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: openstack-clients
diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph
index 54eeeee7..528c9bbf 100644
--- a/systems/devel-system-armv7b-highbank.morph
+++ b/systems/devel-system-armv7b-highbank.morph
@@ -16,6 +16,8 @@ strata:
morph: strata/bsp-armv7b-highbank.morph
- name: tools
morph: strata/tools.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: openstack-common
diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph
index 95212d57..325fbf3f 100644
--- a/systems/devel-system-armv7lhf-chroot.morph
+++ b/systems/devel-system-armv7lhf-chroot.morph
@@ -15,6 +15,8 @@ strata:
morph: strata/foundation.morph
- name: tools
morph: strata/tools.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: openstack-common
diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph
index 5c987497..e3c467c2 100644
--- a/systems/devel-system-armv7lhf-highbank.morph
+++ b/systems/devel-system-armv7lhf-highbank.morph
@@ -17,6 +17,8 @@ strata:
morph: strata/bsp-armv7-highbank.morph
- name: tools
morph: strata/tools.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: openstack-common
diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph
index 9cdc1270..15ec4930 100644
--- a/systems/devel-system-armv7lhf-jetson.morph
+++ b/systems/devel-system-armv7lhf-jetson.morph
@@ -15,6 +15,8 @@ strata:
morph: strata/foundation.morph
- name: tools
morph: strata/tools.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: openstack-common
diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph
index b69b3b13..661cb4c3 100644
--- a/systems/devel-system-armv7lhf-wandboard.morph
+++ b/systems/devel-system-armv7lhf-wandboard.morph
@@ -17,6 +17,8 @@ strata:
morph: strata/bsp-wandboard.morph
- name: tools
morph: strata/tools.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: openstack-common
diff --git a/systems/devel-system-armv8l64.morph b/systems/devel-system-armv8l64.morph
index c4af1d17..0de01791 100644
--- a/systems/devel-system-armv8l64.morph
+++ b/systems/devel-system-armv8l64.morph
@@ -16,6 +16,8 @@ strata:
morph: strata/bsp-armv8l64-generic.morph
- name: tools
morph: strata/tools.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: openstack-common
diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph
index 74d7e38e..415b8291 100644
--- a/systems/devel-system-ppc64-chroot.morph
+++ b/systems/devel-system-ppc64-chroot.morph
@@ -15,6 +15,8 @@ strata:
morph: strata/foundation.morph
- name: tools
morph: strata/tools.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: openstack-common
diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph
index 50cffd69..03c8ded8 100644
--- a/systems/devel-system-ppc64-generic.morph
+++ b/systems/devel-system-ppc64-generic.morph
@@ -16,6 +16,8 @@ strata:
morph: strata/bsp-ppc64-generic.morph
- name: tools
morph: strata/tools.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: openstack-common
diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph
index 1ade237e..be494de9 100644
--- a/systems/devel-system-x86_32-chroot.morph
+++ b/systems/devel-system-x86_32-chroot.morph
@@ -15,6 +15,8 @@ strata:
morph: strata/foundation.morph
- name: tools
morph: strata/tools.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: openstack-clients
diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph
index de75a70a..bd9192f0 100644
--- a/systems/devel-system-x86_32-generic.morph
+++ b/systems/devel-system-x86_32-generic.morph
@@ -16,6 +16,8 @@ strata:
morph: strata/bsp-x86_32-generic.morph
- name: tools
morph: strata/tools.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: openstack-common
diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph
index 23db60c1..c0fee837 100644
--- a/systems/devel-system-x86_64-chroot.morph
+++ b/systems/devel-system-x86_64-chroot.morph
@@ -15,6 +15,8 @@ strata:
morph: strata/foundation.morph
- name: tools
morph: strata/tools.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: openstack-common
diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph
index 46c7c4e5..c3ef57df 100644
--- a/systems/devel-system-x86_64-generic.morph
+++ b/systems/devel-system-x86_64-generic.morph
@@ -16,6 +16,8 @@ strata:
morph: strata/bsp-x86_64-generic.morph
- name: tools
morph: strata/tools.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: openstack-common
diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph
index ca0c717b..19ef90b0 100644
--- a/systems/devel-system-x86_64-vagrant.morph
+++ b/systems/devel-system-x86_64-vagrant.morph
@@ -16,6 +16,8 @@ strata:
morph: strata/bsp-x86_64-generic.morph
- name: tools
morph: strata/tools.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: openstack-common
diff --git a/systems/installer-system-x86_64.morph b/systems/installer-system-x86_64.morph
index 8798182b..559be259 100644
--- a/systems/installer-system-x86_64.morph
+++ b/systems/installer-system-x86_64.morph
@@ -13,6 +13,8 @@ strata:
morph: strata/foundation.morph
- name: bsp-x86_64-generic
morph: strata/bsp-x86_64-generic.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: installer-utils
diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph
index 1a120ef9..b3bd05c7 100644
--- a/systems/trove-system-x86_64.morph
+++ b/systems/trove-system-x86_64.morph
@@ -15,6 +15,8 @@ strata:
morph: strata/python-core.morph
- name: tools
morph: strata/tools.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: pcre-utils
diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph
index 5aea4f7b..957e1400 100644
--- a/systems/xfce-system.morph
+++ b/systems/xfce-system.morph
@@ -33,6 +33,8 @@ strata:
morph: strata/gtk2.morph
- name: tools
morph: strata/tools.morph
+- name: python-cliapp
+ morph: strata/python-cliapp.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: xfce