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

34 files changed, 68 insertions, 0 deletions

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