diff options
| author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2015-02-27 09:02:59 +0000 |
|---|---|---|
| committer | Morph (on behalf of Adam Coldrick) <adam.coldrick@codethink.co.uk> | 2015-02-27 09:02:59 +0000 |
| commit | fdba9529a8b1664119d28bc9ceb9e143a0b414db (patch) | |
| tree | 44b62dc7305da0a7488c0dbbaca41992e4793678 | |
| parent | c4dfc1300794428193c57f3b2a50220a2fd99db4 (diff) | |
| download | definitions-fdba9529a8b1664119d28bc9ceb9e143a0b414db.tar.gz | |
Morph build 3501b91e4d3744c9b38a63af0fdd51d1
System branch: master
| -rw-r--r-- | clusters/release.morph | 4 | ||||
| -rw-r--r-- | strata/ansible.morph | 1 | ||||
| -rw-r--r-- | strata/apache-httpd-server.morph | 1 | ||||
| -rw-r--r-- | strata/databases.morph | 1 | ||||
| -rw-r--r-- | strata/morph-utils.morph | 2 | ||||
| -rw-r--r-- | strata/xstatic.morph | 1 |
6 files changed, 7 insertions, 3 deletions
diff --git a/clusters/release.morph b/clusters/release.morph index 2d8ff003..81e84525 100644 --- a/clusters/release.morph +++ b/clusters/release.morph @@ -23,9 +23,9 @@ systems: build-system-x86_64-chroot: type: tar location: build-system-x86_64-chroot.tar -- morph: systems/test.morph +- morph: systems/build-system-x86_64.morph deploy: - test: + build-system-x86_64: type: rawdisk location: build-system-x86_64.img DISK_SIZE: 6G diff --git a/strata/ansible.morph b/strata/ansible.morph index e0cb8581..29ea73e6 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 1692c61c..065ec155 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 4b06edf3..9171925c 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/morph-utils.morph b/strata/morph-utils.morph index 598efd04..a3b3c969 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -72,7 +72,7 @@ chunks: build-depends: [] - name: morph repo: baserock:baserock/morph - ref: baserock/adamcoldrick/use-ostree-for-artifact-cache + ref: f5163dd418e342fe6e5fb18625828076130a5e57 unpetrify-ref: master build-depends: - cliapp diff --git a/strata/xstatic.morph b/strata/xstatic.morph index 95cacdfb..4323093f 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 |