From d2802faf20cc23c33fc790d7aab8691f1974eba3 Mon Sep 17 00:00:00 2001 From: Mike Smith 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