summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Smith <mike.smith@codethink.co.uk>2014-12-16 16:52:08 (GMT)
committerMike Smith <mike.smith@codethink.co.uk>2014-12-16 16:52:08 (GMT)
commit55f25f33c88bc4041d6f2be690a58d4c4c582f9a (patch)
tree1dae69b914c52dc7addf06c18187598755e6b6a7
parentd2802faf20cc23c33fc790d7aab8691f1974eba3 (diff)
downloaddefinitions-baserock/mikesmith/zookeeper-for-review-v2.tar.gz
split zookeeper and the test programs into multiple strata, on Pedro's suggestionbaserock/mikesmith/zookeeper-for-review-v2
-rw-r--r--strata/zookeeper-client.morph31
-rw-r--r--strata/zookeeper-server.morph30
-rw-r--r--strata/zookeeper.morph31
3 files changed, 35 insertions, 57 deletions
diff --git a/strata/zookeeper-client.morph b/strata/zookeeper-client.morph
index 135b2fc..31a9762 100644
--- a/strata/zookeeper-client.morph
+++ b/strata/zookeeper-client.morph
@@ -1,43 +1,16 @@
name: zookeeper-client
kind: stratum
description: |
- This stratum installs zookeeper and its dependencies.
- It then installs a small demonstration program for the
+ This stratum installs a small demonstration program for the
client side of ZooKeeper. The program can take up to two
arguments:
(1) The IP address of the ZooKeeper server to connect to
(2) The type of client that this will be (default client
types are typeOneNode & typeTwoNode)
build-depends:
-- morph: strata/core.morph
+- morph: strata/zookeper.morph
chunks:
-- name: cppunit
- repo: upstream:cppunit
- ref: 77bb121d73c4593d6e3addacacb1bfbd21f53dcf
- build-depends: []
-- name: java-binary
- morph: strata/zookeeper/java-binary.morph
- repo: github:franred/gerrit-installation-binaries
- ref: ef262c635890f19eaff8ef6bbd831ee9b0d8693e
- unpetrify-ref: master
- build-depends: []
-- name: java-ant
- morph: strata/zookeeper/java-ant.morph
- repo: upstream:java/ant
- ref: master
- build-depends:
- - cppunit
- - java-binary
-- name: zookeeper
- morph: strata/zookeeper/zookeeper.morph
- repo: upstream:zookeeper
- ref: baserock/mikesmith/zookeeper
- unpetrify-ref: trunk
- build-depends:
- - java-ant
- name: zookeeper-client
morph: strata/zookeeper/zookeeper-client.morph
repo: baserock:tests/zookeeper-test
ref: master
- build-depends:
- - zookeeper
diff --git a/strata/zookeeper-server.morph b/strata/zookeeper-server.morph
index de627d3..97acd2c 100644
--- a/strata/zookeeper-server.morph
+++ b/strata/zookeeper-server.morph
@@ -1,36 +1,10 @@
name: zookeeper-server
kind: stratum
-description: a first pass attempt at creating a zookeeper stratum for baserock.
+description: This Stratum installs a zookeeper server and small program to populate it with default data.
build-depends:
-- morph: strata/core.morph
+- morph: strata/zookeeper.morph
chunks:
-- name: cppunit
- repo: upstream:cppunit
- ref: 77bb121d73c4593d6e3addacacb1bfbd21f53dcf
- build-depends: []
-- name: java-binary
- morph: strata/zookeeper/java-binary.morph
- repo: github:franred/gerrit-installation-binaries
- ref: ef262c635890f19eaff8ef6bbd831ee9b0d8693e
- unpetrify-ref: master
- build-depends: []
-- name: java-ant
- morph: strata/zookeeper/java-ant.morph
- repo: upstream:java/ant
- ref: master
- build-depends:
- - cppunit
- - java-binary
-- name: zookeeper
- morph: strata/zookeeper/zookeeper.morph
- repo: upstream:zookeeper
- ref: baserock/mikesmith/zookeeper
- unpetrify-ref: trunk
- build-depends:
- - java-ant
- name: zookeeper-server
morph: strata/zookeeper/zookeeper-server.morph
repo: baserock:tests/zookeeper-test
ref: master
- build-depends:
- - zookeeper
diff --git a/strata/zookeeper.morph b/strata/zookeeper.morph
new file mode 100644
index 0000000..a317082
--- /dev/null
+++ b/strata/zookeeper.morph
@@ -0,0 +1,31 @@
+name: zookeeper-client
+kind: stratum
+description: |
+ This stratum installs zookeeper and its dependencies.
+build-depends:
+- morph: strata/core.morph
+chunks:
+- name: cppunit
+ repo: upstream:cppunit
+ ref: 77bb121d73c4593d6e3addacacb1bfbd21f53dcf
+ build-depends: []
+- name: java-binary
+ morph: strata/zookeeper/java-binary.morph
+ repo: github:franred/gerrit-installation-binaries
+ ref: ef262c635890f19eaff8ef6bbd831ee9b0d8693e
+ unpetrify-ref: master
+ build-depends: []
+- name: java-ant
+ morph: strata/zookeeper/java-ant.morph
+ repo: upstream:java/ant
+ ref: master
+ build-depends:
+ - cppunit
+ - java-binary
+- name: zookeeper
+ morph: strata/zookeeper/zookeeper.morph
+ repo: upstream:zookeeper
+ ref: baserock/mikesmith/zookeeper
+ unpetrify-ref: trunk
+ build-depends:
+ - java-ant