summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-03-13 14:43:35 (GMT)
committerGerrit Code Review <gerrit@baserock.org>2015-03-13 14:43:35 (GMT)
commitdbdcbf87ad455ce56ce61f901d692b587ba6c065 (patch)
treef283127b00975a1ea014cf14470913fd364391cc
parentd42785d06b3b6e3fe143b1a0ce7b4dae390d0dc5 (diff)
parent2f91b8a0eeeb15469f3c5e1b104e34e88fe7df62 (diff)
downloaddefinitions-dbdcbf87ad455ce56ce61f901d692b587ba6c065.tar.gz
Merge "Move cliapp into its own 'python-cliapp' stratum"
-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 a3a195d..2b18d02 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 74ff75a..2d7076f 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 741bbc3..b3a0c77 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 80fce02..b5ba1df 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 0000000..ff6fda3
--- /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 ed5e3d8..ed5e3d8 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 ae67387..4529354 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 ccdbea1..ac227de 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 08802a0..3579efd 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 7d3f475..0990953 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 33a1a4c..f93cd57 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 86d2b69..909b025 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 2426380..37b00e4 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 77f1860..fc7164d 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 730c00d..b58675f 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 23817c0..f0a2780 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 c35cff5..2bf192d 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 40c80c0..9d736f9 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 646a04d..ac919d6 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 74742a8..c27dfd9 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 69681f7..f4720f4 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 9ed6897..bda502e 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 940b772..6cc1fd1 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 8b75425..a2a061c 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 54eeeee..528c9bb 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 95212d5..325fbf3 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 5c98749..e3c467c 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 9cdc127..15ec493 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 b69b3b1..661cb4c 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 c4af1d1..0de0179 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 74d7e38..415b829 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 50cffd6..03c8ded 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 1ade237..be494de 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 de75a70..bd9192f 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 23db60c..c0fee83 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 46c7c4e..c3ef57d 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 ca0c717..19ef90b 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 8798182..559be25 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 1a120ef..b3bd05c 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 5aea4f7..957e140 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