From 89ca4b10b0e26bb91c1a969fece1909e64763716 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 10 Mar 2015 17:08:38 +0000 Subject: Move 'bottle' and 'flup' into separate python-wsgi module 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. --- strata/morph-utils.morph | 11 +---------- strata/python-wsgi.morph | 15 +++++++++++++++ systems/build-system-armv7lhf-highbank.morph | 2 ++ systems/build-system-armv7lhf-jetson.morph | 2 ++ systems/build-system-armv8l64.morph | 2 ++ systems/build-system-ppc64.morph | 2 ++ systems/build-system-x86_32-chroot.morph | 2 ++ systems/build-system-x86_32.morph | 2 ++ systems/build-system-x86_64-chroot.morph | 2 ++ systems/build-system-x86_64.morph | 2 ++ systems/ceph-service-x86_64-generic.morph | 2 ++ systems/devel-system-armv7-chroot.morph | 2 ++ systems/devel-system-armv7-highbank.morph | 2 ++ systems/devel-system-armv7-versatile.morph | 2 ++ systems/devel-system-armv7-wandboard.morph | 2 ++ systems/devel-system-armv7b-chroot.morph | 2 ++ systems/devel-system-armv7b-highbank.morph | 2 ++ systems/devel-system-armv7lhf-chroot.morph | 2 ++ systems/devel-system-armv7lhf-highbank.morph | 2 ++ systems/devel-system-armv7lhf-jetson.morph | 2 ++ systems/devel-system-armv7lhf-wandboard.morph | 2 ++ systems/devel-system-armv8l64.morph | 2 ++ systems/devel-system-ppc64-chroot.morph | 2 ++ systems/devel-system-ppc64-generic.morph | 2 ++ systems/devel-system-x86_32-chroot.morph | 2 ++ systems/devel-system-x86_32-generic.morph | 2 ++ systems/devel-system-x86_64-chroot.morph | 2 ++ systems/devel-system-x86_64-generic.morph | 2 ++ systems/devel-system-x86_64-vagrant.morph | 2 ++ systems/installer-system-x86_64.morph | 2 ++ systems/trove-system-x86_64.morph | 2 ++ systems/xfce-system.morph | 2 ++ 32 files changed, 76 insertions(+), 10 deletions(-) create mode 100644 strata/python-wsgi.morph diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index fe22a851..0a456e65 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 00000000..289d27ba --- /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 4529354c..b9ee8e79 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 ac227de2..6c59cb28 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 3579efd4..63dcb432 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 09909535..600eb683 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 f93cd574..61bf4eaf 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 909b025c..f485287e 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 37b00e43..e8cd7b87 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 fc7164db..b9433409 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 b58675fd..95b17dc0 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 c27dfd9d..e32db851 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 f4720f40..9ae051d1 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 bda502e2..12a2b2b6 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 6cc1fd1d..ec6fea5e 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 a2a061c3..2023ac21 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 528c9bbf..2c7f8ed2 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 325fbf3f..1e2a8f8e 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 e3c467c2..3ef00c34 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 15ec4930..dfc28c45 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 661cb4c3..631692e7 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 0de01791..bad6d6a9 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 415b8291..1ec03145 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 03c8ded8..bfbf3fbb 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 be494de9..e83b1a55 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 bd9192f0..c707125c 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 c0fee837..00e72c84 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 c3ef57df..e0bb1a21 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 19ef90b0..fc40e1f5 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 559be259..cea09c09 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 b3bd05c7..ab50f7f6 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 957e1400..dad3d3dc 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 -- cgit v1.2.1