From 944eb5c30a95765ea6c1032e1ef7b6e9fd1fca30 Mon Sep 17 00:00:00 2001
From: Mike Smith <mike.smith@codethink.co.uk>
Date: Tue, 9 Dec 2014 13:27:21 +0000
Subject: commiting changes to allow server side to start on boot, client side
 to be user testable

---
 strata/zookeeper.morph                  |  6 ++++++
 strata/zookeeper/zookeeper-client.morph | 17 +++++++++++++++++
 strata/zookeeper/zookeeper-server.morph | 30 ++++++++++++++++++++++++++++++
 zookeeper.morph                         |  4 ++--
 4 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 strata/zookeeper/zookeeper-client.morph
 create mode 100644 strata/zookeeper/zookeeper-server.morph

diff --git a/strata/zookeeper.morph b/strata/zookeeper.morph
index 6c73a4e4..1394d489 100644
--- a/strata/zookeeper.morph
+++ b/strata/zookeeper.morph
@@ -28,3 +28,9 @@ chunks:
   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
diff --git a/zookeeper.morph b/zookeeper.morph
index 5278d0c1..bf0b6556 100644
--- a/zookeeper.morph
+++ b/zookeeper.morph
@@ -5,8 +5,8 @@ systems:
     deploy:
       my-kvm-system:
         type: kvm
-        location: kvm+ssh://mikesmith@10.24.2.123/zookeeper/home/mikesmith/workspace/ct183/baserockImages/zookeper.img
+        location: kvm+ssh://mikesmith@10.24.1.198/zookeeper/home/mikesmith/Workspace/CT183/Baserock_Images/zookeeper.img
         DISK_SIZE: 4G
-        RAM_SIZE: 2G
+        RAM_SIZE: 1G
         VCPUS: 1
         HOSTNAME: zk
-- 
cgit v1.2.1