summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-03-10 17:08:38 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-03-10 18:06:31 (GMT)
commit89ca4b10b0e26bb91c1a969fece1909e64763716 (patch)
treeeed5167587b01bb4357271672aec6aaaf49fd13c
parentab776490f62ae8a24aaad09e5a7be149ebaa034a (diff)
downloaddefinitions-baserock/sam/lorry-controller-without-morph.tar.gz
Move 'bottle' and 'flup' into separate python-wsgi modulebaserock/sam/lorry-controller-without-morph
The lorry-controller webapp uses these, as well as morph-cache-server. In order to use lorry-controller in systems that don't contain Morph, we need them to be in a separate stratum.
-rw-r--r--strata/morph-utils.morph11
-rw-r--r--strata/python-wsgi.morph15
-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/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
32 files changed, 76 insertions, 10 deletions
diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph
index fe22a85..0a456e6 100644
--- a/strata/morph-utils.morph
+++ b/strata/morph-utils.morph
@@ -3,6 +3,7 @@ kind: stratum
build-depends:
- morph: strata/core.morph
- morph: strata/python-cliapp.morph
+- morph: strata/python-wsgi.morph
chunks:
- name: python-ttystatus
morph: strata/morph-utils/python-ttystatus.morph
@@ -31,14 +32,6 @@ chunks:
build-depends:
- python-ttystatus
- python-markdown
-- name: bottle
- repo: upstream:bottle
- ref: 5238c615b3ec198fedebb0fcaad4458e3d68d70f
- unpetrify-ref: baserock/morph
-- name: flup
- repo: upstream:flup
- ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70
- unpetrify-ref: baserock/morph
- name: pylru
repo: upstream:python-packages/pylru
ref: 221dd259f5c34562c835611d1cf62384b9019da4
@@ -50,6 +43,4 @@ chunks:
build-depends:
- cmdtest
- pyfilesystem
- - bottle
- - flup
- pylru
diff --git a/strata/python-wsgi.morph b/strata/python-wsgi.morph
new file mode 100644
index 0000000..289d27b
--- /dev/null
+++ b/strata/python-wsgi.morph
@@ -0,0 +1,15 @@
+name: python-wsgi
+kind: stratum
+description: |
+ Python modules for web applications using Web Server Gateway Interface.
+build-depends:
+- morph: strata/python-core.morph
+chunks:
+- name: bottle
+ repo: upstream:bottle
+ ref: 5238c615b3ec198fedebb0fcaad4458e3d68d70f
+ unpetrify-ref: baserock/morph
+- name: flup
+ repo: upstream:flup
+ ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70
+ unpetrify-ref: baserock/morph
diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph
index 4529354..b9ee8e7 100644
--- a/systems/build-system-armv7lhf-highbank.morph
+++ b/systems/build-system-armv7lhf-highbank.morph
@@ -17,6 +17,8 @@ strata:
morph: strata/tools.morph
- name: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.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 ac227de..6c59cb2 100644
--- a/systems/build-system-armv7lhf-jetson.morph
+++ b/systems/build-system-armv7lhf-jetson.morph
@@ -17,6 +17,8 @@ strata:
morph: strata/tools.morph
- name: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.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 3579efd..63dcb43 100644
--- a/systems/build-system-armv8l64.morph
+++ b/systems/build-system-armv8l64.morph
@@ -20,6 +20,8 @@ strata:
morph: strata/tools.morph
- name: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.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 0990953..600eb68 100644
--- a/systems/build-system-ppc64.morph
+++ b/systems/build-system-ppc64.morph
@@ -17,6 +17,8 @@ strata:
morph: strata/tools.morph
- name: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.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 f93cd57..61bf4ea 100644
--- a/systems/build-system-x86_32-chroot.morph
+++ b/systems/build-system-x86_32-chroot.morph
@@ -15,6 +15,8 @@ strata:
morph: strata/tools.morph
- name: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.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 909b025..f485287 100644
--- a/systems/build-system-x86_32.morph
+++ b/systems/build-system-x86_32.morph
@@ -17,6 +17,8 @@ strata:
morph: strata/tools.morph
- name: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.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 37b00e4..e8cd7b8 100644
--- a/systems/build-system-x86_64-chroot.morph
+++ b/systems/build-system-x86_64-chroot.morph
@@ -15,6 +15,8 @@ strata:
morph: strata/tools.morph
- name: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.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 fc7164d..b943340 100644
--- a/systems/build-system-x86_64.morph
+++ b/systems/build-system-x86_64.morph
@@ -17,6 +17,8 @@ strata:
morph: strata/tools.morph
- name: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.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 b58675f..95b17dc 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: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: openstack-common
diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph
index c27dfd9..e32db85 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: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.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 f4720f4..9ae051d 100644
--- a/systems/devel-system-armv7-highbank.morph
+++ b/systems/devel-system-armv7-highbank.morph
@@ -18,6 +18,8 @@ strata:
morph: strata/tools.morph
- name: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.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 bda502e..12a2b2b 100644
--- a/systems/devel-system-armv7-versatile.morph
+++ b/systems/devel-system-armv7-versatile.morph
@@ -18,6 +18,8 @@ strata:
morph: strata/tools.morph
- name: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.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 6cc1fd1..ec6fea5 100644
--- a/systems/devel-system-armv7-wandboard.morph
+++ b/systems/devel-system-armv7-wandboard.morph
@@ -18,6 +18,8 @@ strata:
morph: strata/tools.morph
- name: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.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 a2a061c..2023ac2 100644
--- a/systems/devel-system-armv7b-chroot.morph
+++ b/systems/devel-system-armv7b-chroot.morph
@@ -17,6 +17,8 @@ strata:
morph: strata/tools.morph
- name: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.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 528c9bb..2c7f8ed 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: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.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 325fbf3..1e2a8f8 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: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.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 e3c467c..3ef00c3 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: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.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 15ec493..dfc28c4 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: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.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 661cb4c..631692e 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: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.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 0de0179..bad6d6a 100644
--- a/systems/devel-system-armv8l64.morph
+++ b/systems/devel-system-armv8l64.morph
@@ -18,6 +18,8 @@ strata:
morph: strata/tools.morph
- name: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.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 415b829..1ec0314 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: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.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 03c8ded..bfbf3fb 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: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.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 be494de..e83b1a5 100644
--- a/systems/devel-system-x86_32-chroot.morph
+++ b/systems/devel-system-x86_32-chroot.morph
@@ -17,6 +17,8 @@ strata:
morph: strata/tools.morph
- name: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.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 bd9192f..c707125 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: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.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 c0fee83..00e72c8 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: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.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 c3ef57d..e0bb1a2 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: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.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 19ef90b..fc40e1f 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: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.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 559be25..cea09c0 100644
--- a/systems/installer-system-x86_64.morph
+++ b/systems/installer-system-x86_64.morph
@@ -15,6 +15,8 @@ strata:
morph: strata/bsp-x86_64-generic.morph
- name: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.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 b3bd05c..ab50f7f 100644
--- a/systems/trove-system-x86_64.morph
+++ b/systems/trove-system-x86_64.morph
@@ -17,6 +17,8 @@ strata:
morph: strata/tools.morph
- name: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.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 957e140..dad3d3d 100644
--- a/systems/xfce-system.morph
+++ b/systems/xfce-system.morph
@@ -35,6 +35,8 @@ strata:
morph: strata/tools.morph
- name: python-cliapp
morph: strata/python-cliapp.morph
+- name: python-wsgi
+ morph: strata/python-wsgi.morph
- name: morph-utils
morph: strata/morph-utils.morph
- name: xfce