diff options
| author | Mike Smith <mike.smith@codethink.co.uk> | 2014-12-17 11:35:07 +0000 |
|---|---|---|
| committer | Mike Smith <mike.smith@codethink.co.uk> | 2014-12-17 11:35:07 +0000 |
| commit | b7507cc2ab7dcbcb227f5fdf1686946b7be69d6a (patch) | |
| tree | 4586b12a97d2d11d5e4ae17601841db54b9bb894 | |
| parent | 55f25f33c88bc4041d6f2be690a58d4c4c582f9a (diff) | |
| download | definitions-b7507cc2ab7dcbcb227f5fdf1686946b7be69d6a.tar.gz | |
split zookeeper and test programs into different .morphs to allow just zookeeper to be installed if required.
| -rw-r--r-- | strata/zookeeper-client.morph | 3 | ||||
| -rw-r--r-- | strata/zookeeper-server.morph | 1 | ||||
| -rw-r--r-- | strata/zookeeper.morph | 2 | ||||
| -rw-r--r-- | systems/zookeeper-client-x86_64.morph | 3 | ||||
| -rw-r--r-- | systems/zookeeper-server-x86_64.morph | 3 |
5 files changed, 8 insertions, 4 deletions
diff --git a/strata/zookeeper-client.morph b/strata/zookeeper-client.morph index 31a97629..d4502ea1 100644 --- a/strata/zookeeper-client.morph +++ b/strata/zookeeper-client.morph @@ -8,9 +8,10 @@ description: | (2) The type of client that this will be (default client types are typeOneNode & typeTwoNode) build-depends: -- morph: strata/zookeper.morph +- morph: strata/zookeeper.morph chunks: - name: zookeeper-client morph: strata/zookeeper/zookeeper-client.morph repo: baserock:tests/zookeeper-test ref: master + build-depends: [] diff --git a/strata/zookeeper-server.morph b/strata/zookeeper-server.morph index 97acd2ca..6ad4269e 100644 --- a/strata/zookeeper-server.morph +++ b/strata/zookeeper-server.morph @@ -8,3 +8,4 @@ chunks: morph: strata/zookeeper/zookeeper-server.morph repo: baserock:tests/zookeeper-test ref: master + build-depends: [] diff --git a/strata/zookeeper.morph b/strata/zookeeper.morph index a3170826..3bcd5cca 100644 --- a/strata/zookeeper.morph +++ b/strata/zookeeper.morph @@ -1,4 +1,4 @@ -name: zookeeper-client +name: zookeeper kind: stratum description: | This stratum installs zookeeper and its dependencies. diff --git a/systems/zookeeper-client-x86_64.morph b/systems/zookeeper-client-x86_64.morph index 0df11aff..c8ac7784 100644 --- a/systems/zookeeper-client-x86_64.morph +++ b/systems/zookeeper-client-x86_64.morph @@ -9,6 +9,8 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph +- name: foundation + morph: strata/foundation.morph - name: bsp-x86_64-generic morph: strata/bsp-x86_64-generic.morph - name: zookeeper-client @@ -19,4 +21,3 @@ configuration-extensions: - simple-network - nfsboot - install-files -- cloud-init diff --git a/systems/zookeeper-server-x86_64.morph b/systems/zookeeper-server-x86_64.morph index 898cfe22..ad022a91 100644 --- a/systems/zookeeper-server-x86_64.morph +++ b/systems/zookeeper-server-x86_64.morph @@ -9,6 +9,8 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph +- name: foundation + morph: strata/foundation.morph - name: bsp-x86_64-generic morph: strata/bsp-x86_64-generic.morph - name: zookeeper-server @@ -19,4 +21,3 @@ configuration-extensions: - simple-network - nfsboot - install-files -- cloud-init |