summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-02-26 17:20:04 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-02-26 17:20:04 (GMT)
commit67e689eb3d83098dc9eb633c4d1ae69eb90f63f8 (patch)
treec6e64d874b8c195a772b8ebc5db73a33c077d5b2
parent38bc8b124a2c15abde91c7c263a833459071efa5 (diff)
parent2cd6084b0a24be5ab62a892bf4dfc5efd1b1db1e (diff)
downloaddefinitions-67e689eb3d83098dc9eb633c4d1ae69eb90f63f8.tar.gz
Merge branch 'sam/python-core-fixes'
Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk> Reviewed-By: Adam Coldrick <adam.coldrick@codethink.co.uk> Reviewed-By: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
-rw-r--r--strata/ansible.morph1
-rw-r--r--strata/apache-httpd-server.morph1
-rw-r--r--strata/databases.morph1
-rw-r--r--strata/xstatic.morph1
4 files changed, 4 insertions, 0 deletions
diff --git a/strata/ansible.morph b/strata/ansible.morph
index e0cb858..29ea73e 100644
--- a/strata/ansible.morph
+++ b/strata/ansible.morph
@@ -3,6 +3,7 @@ kind: stratum
description: A stratum with ansible and its dependencies
build-depends:
- morph: strata/core.morph
+- morph: strata/python-core.morph
chunks:
- name: paramiko
repo: upstream:paramiko
diff --git a/strata/apache-httpd-server.morph b/strata/apache-httpd-server.morph
index 1692c61..065ec15 100644
--- a/strata/apache-httpd-server.morph
+++ b/strata/apache-httpd-server.morph
@@ -4,6 +4,7 @@ description: apache http web server and some utilities related to it
build-depends:
- morph: strata/tools.morph
- morph: strata/pcre-utils.morph
+- morph: strata/python-core.morph
chunks:
- name: apr
morph: strata/apache-httpd-server/apr.morph
diff --git a/strata/databases.morph b/strata/databases.morph
index 4b06edf..9171925 100644
--- a/strata/databases.morph
+++ b/strata/databases.morph
@@ -4,6 +4,7 @@ description: some popular databases and some utils related to databases
build-depends:
- morph: strata/tools.morph
- morph: strata/nfs.morph
+- morph: strata/python-core.morph
chunks:
- name: postgresql
repo: upstream:postgresql
diff --git a/strata/xstatic.morph b/strata/xstatic.morph
index d3a4228..7b40ee6 100644
--- a/strata/xstatic.morph
+++ b/strata/xstatic.morph
@@ -10,6 +10,7 @@ description: |
but it is required right now for the Openstack system to work.
build-depends:
- morph: strata/foundation.morph
+- morph: strata/python-core.morph
chunks:
- name: xstatic
repo: upstream:xstatic