summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-12-16 16:49:01 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-12-16 16:49:01 +0000
commitcaa830c5181e0d1c8c6150f9859a530ef5acc9af (patch)
treeb17476c9fad2cc5e94e09f15c6c984df853b62db
parentd2802faf20cc23c33fc790d7aab8691f1974eba3 (diff)
downloaddefinitions-caa830c5181e0d1c8c6150f9859a530ef5acc9af.tar.gz
Create zookeeper stratum to avoid duplication
-rw-r--r--strata/zookeeper-client.morph32
-rw-r--r--strata/zookeeper-server.morph31
-rw-r--r--strata/zookeeper.morph31
3 files changed, 37 insertions, 57 deletions
diff --git a/strata/zookeeper-client.morph b/strata/zookeeper-client.morph
index 135b2fc5..d4502ea1 100644
--- a/strata/zookeeper-client.morph
+++ b/strata/zookeeper-client.morph
@@ -1,43 +1,17 @@
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/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-client
morph: strata/zookeeper/zookeeper-client.morph
repo: baserock:tests/zookeeper-test
ref: master
- build-depends:
- - zookeeper
+ build-depends: []
diff --git a/strata/zookeeper-server.morph b/strata/zookeeper-server.morph
index de627d39..a12dc31f 100644
--- a/strata/zookeeper-server.morph
+++ b/strata/zookeeper-server.morph
@@ -1,36 +1,11 @@
name: zookeeper-server
kind: stratum
-description: a first pass attempt at creating a zookeeper stratum for baserock.
+description: This stratum installs a zookeeper server test.
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
+ build-depends: []
diff --git a/strata/zookeeper.morph b/strata/zookeeper.morph
new file mode 100644
index 00000000..3bcd5cca
--- /dev/null
+++ b/strata/zookeeper.morph
@@ -0,0 +1,31 @@
+name: zookeeper
+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