From 137433f34b2a9b7fa48b9a807f755cf6de898c47 Mon Sep 17 00:00:00 2001
From: Mike Smith <mike.smith@codethink.co.uk>
Date: Thu, 11 Dec 2014 14:23:59 +0000
Subject: Add chunks for Java, ANT and ZooKeeper

Java is sourced from the binary Java release from Oracle.  This
chunk was originally written by Francisco Marchena.

ANT is a Java build system and is needed by ZooKeeper.

ZooKeeper itself is documented at http://zookeeper.apache.org/
---
 strata/zookeeper/java-ant.morph    |  9 +++++++++
 strata/zookeeper/java-binary.morph | 11 +++++++++++
 strata/zookeeper/zookeeper.morph   | 14 ++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 100644 strata/zookeeper/java-ant.morph
 create mode 100644 strata/zookeeper/java-binary.morph
 create mode 100644 strata/zookeeper/zookeeper.morph

diff --git a/strata/zookeeper/java-ant.morph b/strata/zookeeper/java-ant.morph
new file mode 100644
index 00000000..7b403c78
--- /dev/null
+++ b/strata/zookeeper/java-ant.morph
@@ -0,0 +1,9 @@
+name: ant
+kind: chunk
+build-commands:
+- |
+  export JAVA_HOME=/usr/lib/jdk1.8.0_20
+  mkdir "$DESTDIR"/urs/lib/ant
+  sh build.sh -Ddist.dir="$DESTDIR/usr/lib/ant" dist
+- mkdir -p "${DESTDIR}${PREFIX}/bin"
+- ln -sf "${PREFIX}/lib/ant/bin/ant" "${DESTDIR}${PREFIX}/bin/ant"
diff --git a/strata/zookeeper/java-binary.morph b/strata/zookeeper/java-binary.morph
new file mode 100644
index 00000000..a6c11f95
--- /dev/null
+++ b/strata/zookeeper/java-binary.morph
@@ -0,0 +1,11 @@
+name: java-binary
+kind: chunk
+configure-commands: []
+build-commands:
+- cat jdk-8u20-linux-x64.tar.gz_* > jdk-8u20-linux-x64.tar.gz
+install-commands:
+- mkdir -p "$DESTDIR$PREFIX"/bin
+- mkdir -p "$DESTDIR$PREFIX"/lib
+- tar zxf jdk-8u20-linux-x64.tar.gz -C "$DESTDIR$PREFIX"/lib
+- unzip jce_policy-8.zip -d "$DESTDIR$PREFIX"/lib/jdk1.8.0_20/jre/lib/security
+- ln -sfn "$PREFIX"/lib/jdk1.8.0_20/jre/bin/java "$DESTDIR$PREFIX"/bin/
diff --git a/strata/zookeeper/zookeeper.morph b/strata/zookeeper/zookeeper.morph
new file mode 100644
index 00000000..dbe6ccbb
--- /dev/null
+++ b/strata/zookeeper/zookeeper.morph
@@ -0,0 +1,14 @@
+name: zookeeper
+kind: chunk
+configure-commands:
+  - mkdir -p "$DESTDIR$PREFIX"/lib/zookeeper
+build-commands:
+  - ant -p compile_jute
+  - mkdir -p "$DESTDIR$PREFIX"/zookeeper
+  - cp -r * "$DESTDIR$PREFIX"/zookeeper
+  - cd "$DESTDIR$PREFIX"/zookeeper/src/c && autoreconf -i
+  - cd "$DESTDIR$PREFIX"/zookeeper/src/c && ./configure --prefix="$PREFIX" --libdir="$PREFIX"/lib/
+  - make -C "$DESTDIR$PREFIX"/zookeeper/src/c
+  - cd "$DESTDIR$PREFIX"/zookeeper/src/c && make install
+  - mv "$DESTDIR$PREFIX"/zookeeper/conf/zoo_sample.cfg "$DESTDIR$PREFIX"/zookeeper/conf/zoo.cfg 
+  - make -C "$DESTDIR$PREFIX"/zookeeper/src/c zktest-mt
-- 
cgit v1.2.1


From 88514e178073110372b06edbf00eba1a9a8d2a36 Mon Sep 17 00:00:00 2001
From: Mike Smith <mike.smith@codethink.co.uk>
Date: Thu, 11 Dec 2014 14:27:26 +0000
Subject: Add ZooKeeper demonstration application and strata.

The ZooKeeper demonstration server and client are currently hosted
on github.  The strata bring together Java, ANT, ZooKeeper and
the client and server respectively for demonstration purposes.
---
 strata/zookeeper-client.morph           | 36 +++++++++++++++++++++++++++++++++
 strata/zookeeper-server.morph           | 36 +++++++++++++++++++++++++++++++++
 strata/zookeeper/zookeeper-client.morph | 17 ++++++++++++++++
 strata/zookeeper/zookeeper-server.morph | 30 +++++++++++++++++++++++++++
 4 files changed, 119 insertions(+)
 create mode 100644 strata/zookeeper-client.morph
 create mode 100644 strata/zookeeper-server.morph
 create mode 100644 strata/zookeeper/zookeeper-client.morph
 create mode 100644 strata/zookeeper/zookeeper-server.morph

diff --git a/strata/zookeeper-client.morph b/strata/zookeeper-client.morph
new file mode 100644
index 00000000..6194b587
--- /dev/null
+++ b/strata/zookeeper-client.morph
@@ -0,0 +1,36 @@
+name: zookeeper
+kind: stratum
+description: a first pass attempt at creating a zookeeper stratum for baserock.
+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
+- name: zookeeper-client
+  morph: strata/zookeeper/zookeeper-client.morph
+  repo: https://github.com/MichaelPSmith/ZookeeperExperiments
+  ref: master
+  build-depends:
+  - zookeeper
diff --git a/strata/zookeeper-server.morph b/strata/zookeeper-server.morph
new file mode 100644
index 00000000..1394d489
--- /dev/null
+++ b/strata/zookeeper-server.morph
@@ -0,0 +1,36 @@
+name: zookeeper
+kind: stratum
+description: a first pass attempt at creating a zookeeper stratum for baserock.
+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
+- name: zookeeper-server
+  morph: strata/zookeeper/zookeeper-server.morph
+  repo: https://github.com/MichaelPSmith/ZookeeperExperiments
+  ref: master
+  build-depends:
+  - zookeeper
diff --git a/strata/zookeeper/zookeeper-client.morph b/strata/zookeeper/zookeeper-client.morph
new file mode 100644
index 00000000..591c1840
--- /dev/null
+++ b/strata/zookeeper/zookeeper-client.morph
@@ -0,0 +1,17 @@
+name: zookeeper-client
+kind: chunk
+build-commands:
+ - mkdir -p "$DESTDIR$PREFIX"/zookeeper-client
+ - cp -r * "$DESTDIR$PREFIX"/zookeeper-client
+ - make -C "$DESTDIR$PREFIX"/zookeeper-client/ZKTest/Release/
+post-install-commands:
+ - |
+   install -D -m 644 /proc/self/fd/0 << 'EOF' "$DESTDIR"/etc/systemd/system/zookeeper-client.service
+   [unit]
+       Description=Zookeeper client init
+   [Service]
+       ExecStart=/usr/zookeeper-client/ZKTest/Release/ZKTest nodeTypeOne 10.24.1.198
+       RemainAfterExit=yes
+   [Install]
+       WantedBy=multi-user.target
+   EOF
diff --git a/strata/zookeeper/zookeeper-server.morph b/strata/zookeeper/zookeeper-server.morph
new file mode 100644
index 00000000..082c063c
--- /dev/null
+++ b/strata/zookeeper/zookeeper-server.morph
@@ -0,0 +1,30 @@
+name: zookeeper-server
+kind: chunk
+build-commands:
+ - mkdir -p "$DESTDIR$PREFIX"/zookeeper_server
+ - cp -r * "$DESTDIR$PREFIX"/zookeeper_server
+ - make -C "$DESTDIR$PREFIX"/zookeeper_server/zkServerFileSetup/Release/ 
+post-install-commands:
+ - |
+   install -D -m 644 /proc/self/fd/0 << 'EOF' "$DESTDIR"/etc/systemd/system/zookeeper-server.service
+   [unit]
+       Description=Zookeeper server
+   [Service]
+       ExecStart=/usr/zookeeper/bin/zkServer.sh start
+       RemainAfterExit=yes
+   [Install]
+       WantedBy=multi-user.target
+   EOF
+ - |
+   install -D -m 644 /proc/self/fd/0 << 'EOF' "$DESTDIR"/etc/systemd/system/zookeeper-init.service
+   [unit]
+       Description=Zookeeper server init
+   [Service]
+       ExecStart=/usr/zookeeper_server/zkServerFileSetup/Release/zkServerFileSetup
+       RemainAfterExit=no
+   [Install]
+       WantedBy=multi-user.target
+   EOF
+ - mkdir "$DESTDIR"/etc/systemd/system/multi-user.target.wants
+ - ln -s "$DESTDIR"/etc/systemd/system/zookeeper-server.service "$DESTDIR"/etc/systemd/system/multi-user.target.wants/zookeeper-server.service 
+ - ln -s "$DESTDIR"/etc/systemd/system/zookeeper-init.service "$DESTDIR"/etc/systemd/system/multi-user.target.wants/zookeeper-init.service
-- 
cgit v1.2.1


From e2b24f9b20ca11d86c0680be91a6532162b34baa Mon Sep 17 00:00:00 2001
From: Mike Smith <mike.smith@codethink.co.uk>
Date: Thu, 11 Dec 2014 14:28:25 +0000
Subject: Add ZooKeeper systems for x86_64 and example cluster to deploy them.

The Java binary chunk only works for x86_64.  As such, these
systems are limited to that architecture and use the demo strata
developed in the previous commit.

The cluster provides the ability to deploy either or both of the
systems to a libvirt/kvm host.
---
 clusters/zookeeper.morph                           | 21 +++++++++++++++
 systems/devel-system-x86_64-zookeeper-client.morph | 31 ++++++++++++++++++++++
 systems/devel-system-x86_64-zookeeper-server.morph | 31 ++++++++++++++++++++++
 3 files changed, 83 insertions(+)
 create mode 100644 clusters/zookeeper.morph
 create mode 100644 systems/devel-system-x86_64-zookeeper-client.morph
 create mode 100644 systems/devel-system-x86_64-zookeeper-server.morph

diff --git a/clusters/zookeeper.morph b/clusters/zookeeper.morph
new file mode 100644
index 00000000..b7f2dd27
--- /dev/null
+++ b/clusters/zookeeper.morph
@@ -0,0 +1,21 @@
+name: zookeeper
+kind: cluster
+systems:
+  - morph: systems/devel-system-x86_64-zookeeper-client.morph
+    deploy:
+      my-client-system:
+        type: kvm
+        location: kvm+ssh://username@HOSTNAME/machinename/path/to/zookeeper-client.img
+        DISK_SIZE: 4G
+        RAM_SIZE: 1G
+        VCPUS: 1
+        HOSTNAME: zkclient
+  - morph: systems/devel-system-x86_64-zookeeper-server.morph
+    deploy:
+      my-server-system:
+        type: kvm
+        location: kvm+ssh://username@HOSTNAME/machinename/path/to/zookeeper-server.img
+        DISK_SIZE: 4G
+        RAM_SIZE: 1G
+        VCPUS: 1
+        HOSTNAME: zkserver
diff --git a/systems/devel-system-x86_64-zookeeper-client.morph b/systems/devel-system-x86_64-zookeeper-client.morph
new file mode 100644
index 00000000..6f6f438f
--- /dev/null
+++ b/systems/devel-system-x86_64-zookeeper-client.morph
@@ -0,0 +1,31 @@
+name: devel-system-x86_64-zookeeper-client
+kind: system
+description: A system that is able to build other systems based on the 64-bit x86
+  architecture. includes th installation of zookeeper and a test client.
+arch: x86_64
+strata:
+- name: build-essential
+  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: tools
+  morph: strata/tools.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
+- name: openstack-clients
+  morph: strata/openstack-clients.morph
+- name: cloudinit-support
+  morph: strata/cloudinit-support.morph
+- name: zookeeper
+  morph: strata/zookeeper-client.morph
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- cloud-init
diff --git a/systems/devel-system-x86_64-zookeeper-server.morph b/systems/devel-system-x86_64-zookeeper-server.morph
new file mode 100644
index 00000000..1c1f8496
--- /dev/null
+++ b/systems/devel-system-x86_64-zookeeper-server.morph
@@ -0,0 +1,31 @@
+name: devel-system-x86_64-zookeeper-server
+kind: system
+description: A system that is able to build other systems based on the 64-bit x86
+  architecture. includes the zookeeper server and setup for basic tests
+arch: x86_64
+strata:
+- name: build-essential
+  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: tools
+  morph: strata/tools.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
+- name: openstack-clients
+  morph: strata/openstack-clients.morph
+- name: cloudinit-support
+  morph: strata/cloudinit-support.morph
+- name: zookeeper
+  morph: strata/zookeeper-server.morph
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- cloud-init
-- 
cgit v1.2.1


From d2802faf20cc23c33fc790d7aab8691f1974eba3 Mon Sep 17 00:00:00 2001
From: Mike Smith <mike.smith@codethink.co.uk>
Date: Tue, 16 Dec 2014 15:41:36 +0000
Subject: Updated Repo to respond to comments from review. see full desc for
 list.

* Removed un-needed 'mkdir' command from ant setup.
* Addressed in e-mail thread relating to this patch the reason for compiling inside of install dirrectory.
* Added more informative discriptions to .morphs
* Renames 'java/ant' to java-ant to be more consistant with naming conventions
* Removed un-nessisary inclusion of the Devel-system.
* Zookeeper strata names now reflect client / server roles
---
 clusters/zookeeper.morph                           |  4 +--
 strata/zookeeper-client.morph                      | 17 ++++++++----
 strata/zookeeper-server.morph                      |  8 +++---
 strata/zookeeper/java-ant.morph                    |  1 -
 systems/devel-system-x86_64-zookeeper-client.morph | 31 ----------------------
 systems/devel-system-x86_64-zookeeper-server.morph | 31 ----------------------
 systems/zookeeper-client-x86_64.morph              | 22 +++++++++++++++
 systems/zookeeper-server-x86_64.morph              | 22 +++++++++++++++
 8 files changed, 62 insertions(+), 74 deletions(-)
 delete mode 100644 systems/devel-system-x86_64-zookeeper-client.morph
 delete mode 100644 systems/devel-system-x86_64-zookeeper-server.morph
 create mode 100644 systems/zookeeper-client-x86_64.morph
 create mode 100644 systems/zookeeper-server-x86_64.morph

diff --git a/clusters/zookeeper.morph b/clusters/zookeeper.morph
index b7f2dd27..1153d4b0 100644
--- a/clusters/zookeeper.morph
+++ b/clusters/zookeeper.morph
@@ -1,7 +1,7 @@
 name: zookeeper
 kind: cluster
 systems:
-  - morph: systems/devel-system-x86_64-zookeeper-client.morph
+  - morph: systems/zookeeper-client-x86_64.morph
     deploy:
       my-client-system:
         type: kvm
@@ -10,7 +10,7 @@ systems:
         RAM_SIZE: 1G
         VCPUS: 1
         HOSTNAME: zkclient
-  - morph: systems/devel-system-x86_64-zookeeper-server.morph
+  - morph: systems/zookeeper-server-x86_64.morph
     deploy:
       my-server-system:
         type: kvm
diff --git a/strata/zookeeper-client.morph b/strata/zookeeper-client.morph
index 6194b587..135b2fc5 100644
--- a/strata/zookeeper-client.morph
+++ b/strata/zookeeper-client.morph
@@ -1,6 +1,13 @@
-name: zookeeper
+name: zookeeper-client
 kind: stratum
-description: a first pass attempt at creating a zookeeper stratum for baserock.
+description: |
+  This stratum installs zookeeper and its dependencies.
+  It then 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
 chunks:
@@ -14,7 +21,7 @@ chunks:
   ref: ef262c635890f19eaff8ef6bbd831ee9b0d8693e
   unpetrify-ref: master
   build-depends: []
-- name: java/ant
+- name: java-ant
   morph: strata/zookeeper/java-ant.morph
   repo: upstream:java/ant
   ref: master
@@ -27,10 +34,10 @@ chunks:
   ref: baserock/mikesmith/zookeeper
   unpetrify-ref: trunk
   build-depends:
-  - java/ant
+  - java-ant
 - name: zookeeper-client
   morph: strata/zookeeper/zookeeper-client.morph
-  repo: https://github.com/MichaelPSmith/ZookeeperExperiments
+  repo: baserock:tests/zookeeper-test
   ref: master
   build-depends:
   - zookeeper
diff --git a/strata/zookeeper-server.morph b/strata/zookeeper-server.morph
index 1394d489..de627d39 100644
--- a/strata/zookeeper-server.morph
+++ b/strata/zookeeper-server.morph
@@ -1,4 +1,4 @@
-name: zookeeper
+name: zookeeper-server
 kind: stratum
 description: a first pass attempt at creating a zookeeper stratum for baserock.
 build-depends:
@@ -14,7 +14,7 @@ chunks:
   ref: ef262c635890f19eaff8ef6bbd831ee9b0d8693e
   unpetrify-ref: master
   build-depends: []
-- name: java/ant
+- name: java-ant
   morph: strata/zookeeper/java-ant.morph
   repo: upstream:java/ant
   ref: master
@@ -27,10 +27,10 @@ chunks:
   ref: baserock/mikesmith/zookeeper
   unpetrify-ref: trunk
   build-depends:
-  - java/ant
+  - java-ant
 - name: zookeeper-server
   morph: strata/zookeeper/zookeeper-server.morph
-  repo: https://github.com/MichaelPSmith/ZookeeperExperiments
+  repo: baserock:tests/zookeeper-test
   ref: master
   build-depends:
   - zookeeper
diff --git a/strata/zookeeper/java-ant.morph b/strata/zookeeper/java-ant.morph
index 7b403c78..37d402b0 100644
--- a/strata/zookeeper/java-ant.morph
+++ b/strata/zookeeper/java-ant.morph
@@ -3,7 +3,6 @@ kind: chunk
 build-commands:
 - |
   export JAVA_HOME=/usr/lib/jdk1.8.0_20
-  mkdir "$DESTDIR"/urs/lib/ant
   sh build.sh -Ddist.dir="$DESTDIR/usr/lib/ant" dist
 - mkdir -p "${DESTDIR}${PREFIX}/bin"
 - ln -sf "${PREFIX}/lib/ant/bin/ant" "${DESTDIR}${PREFIX}/bin/ant"
diff --git a/systems/devel-system-x86_64-zookeeper-client.morph b/systems/devel-system-x86_64-zookeeper-client.morph
deleted file mode 100644
index 6f6f438f..00000000
--- a/systems/devel-system-x86_64-zookeeper-client.morph
+++ /dev/null
@@ -1,31 +0,0 @@
-name: devel-system-x86_64-zookeeper-client
-kind: system
-description: A system that is able to build other systems based on the 64-bit x86
-  architecture. includes th installation of zookeeper and a test client.
-arch: x86_64
-strata:
-- name: build-essential
-  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: tools
-  morph: strata/tools.morph
-- name: morph-utils
-  morph: strata/morph-utils.morph
-- name: openstack-clients
-  morph: strata/openstack-clients.morph
-- name: cloudinit-support
-  morph: strata/cloudinit-support.morph
-- name: zookeeper
-  morph: strata/zookeeper-client.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- cloud-init
diff --git a/systems/devel-system-x86_64-zookeeper-server.morph b/systems/devel-system-x86_64-zookeeper-server.morph
deleted file mode 100644
index 1c1f8496..00000000
--- a/systems/devel-system-x86_64-zookeeper-server.morph
+++ /dev/null
@@ -1,31 +0,0 @@
-name: devel-system-x86_64-zookeeper-server
-kind: system
-description: A system that is able to build other systems based on the 64-bit x86
-  architecture. includes the zookeeper server and setup for basic tests
-arch: x86_64
-strata:
-- name: build-essential
-  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: tools
-  morph: strata/tools.morph
-- name: morph-utils
-  morph: strata/morph-utils.morph
-- name: openstack-clients
-  morph: strata/openstack-clients.morph
-- name: cloudinit-support
-  morph: strata/cloudinit-support.morph
-- name: zookeeper
-  morph: strata/zookeeper-server.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- cloud-init
diff --git a/systems/zookeeper-client-x86_64.morph b/systems/zookeeper-client-x86_64.morph
new file mode 100644
index 00000000..0df11aff
--- /dev/null
+++ b/systems/zookeeper-client-x86_64.morph
@@ -0,0 +1,22 @@
+name: zookeeper-client-x86_64
+kind: system
+description: |
+  A system that is able to build other systems based on the 64-bit x86
+  architecture. includes the installation of zookeeper and a test client.
+arch: x86_64
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: bsp-x86_64-generic
+  morph: strata/bsp-x86_64-generic.morph
+- name: zookeeper-client
+  morph: strata/zookeeper-client.morph
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- cloud-init
diff --git a/systems/zookeeper-server-x86_64.morph b/systems/zookeeper-server-x86_64.morph
new file mode 100644
index 00000000..898cfe22
--- /dev/null
+++ b/systems/zookeeper-server-x86_64.morph
@@ -0,0 +1,22 @@
+name: zookeeper-server-X86_64
+kind: system
+description: |
+  A system that is able to build other systems based on the 64-bit x86
+  architecture. includes the zookeeper server and setup for basic tests
+arch: x86_64
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: bsp-x86_64-generic
+  morph: strata/bsp-x86_64-generic.morph
+- name: zookeeper-server
+  morph: strata/zookeeper-server.morph
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- cloud-init
-- 
cgit v1.2.1


From 55f25f33c88bc4041d6f2be690a58d4c4c582f9a Mon Sep 17 00:00:00 2001
From: Mike Smith <mike.smith@codethink.co.uk>
Date: Tue, 16 Dec 2014 16:52:08 +0000
Subject: split zookeeper and the test programs into multiple strata, on
 Pedro's suggestion

---
 strata/zookeeper-client.morph | 31 ++-----------------------------
 strata/zookeeper-server.morph | 30 ++----------------------------
 strata/zookeeper.morph        | 31 +++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 57 deletions(-)
 create mode 100644 strata/zookeeper.morph

diff --git a/strata/zookeeper-client.morph b/strata/zookeeper-client.morph
index 135b2fc5..31a97629 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 de627d39..97acd2ca 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 00000000..a3170826
--- /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
-- 
cgit v1.2.1


From b7507cc2ab7dcbcb227f5fdf1686946b7be69d6a Mon Sep 17 00:00:00 2001
From: Mike Smith <mike.smith@codethink.co.uk>
Date: Wed, 17 Dec 2014 11:35:07 +0000
Subject: split zookeeper and test programs into different .morphs to allow
 just zookeeper to be installed if required.

---
 strata/zookeeper-client.morph         | 3 ++-
 strata/zookeeper-server.morph         | 1 +
 strata/zookeeper.morph                | 2 +-
 systems/zookeeper-client-x86_64.morph | 3 ++-
 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
-- 
cgit v1.2.1