summaryrefslogtreecommitdiff
path: root/systems
diff options
context:
space:
mode:
authorMike Smith <mike.smith@codethink.co.uk>2014-12-16 15:41:36 +0000
committerMike Smith <mike.smith@codethink.co.uk>2014-12-16 15:41:36 +0000
commitd2802faf20cc23c33fc790d7aab8691f1974eba3 (patch)
tree9a36143cc4b5a80a9b23d0eb06e3ade1bf8bfbb7 /systems
parente2b24f9b20ca11d86c0680be91a6532162b34baa (diff)
downloaddefinitions-baserock/mikesmith/zookeeper-for-review.tar.gz
Updated Repo to respond to comments from review. see full desc for list.baserock/mikesmith/zookeeper-for-review
* 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
Diffstat (limited to 'systems')
-rw-r--r--systems/devel-system-x86_64-zookeeper-client.morph31
-rw-r--r--systems/zookeeper-client-x86_64.morph22
-rw-r--r--systems/zookeeper-server-x86_64.morph (renamed from systems/devel-system-x86_64-zookeeper-server.morph)17
3 files changed, 26 insertions, 44 deletions
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/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/devel-system-x86_64-zookeeper-server.morph b/systems/zookeeper-server-x86_64.morph
index 1c1f8496..898cfe22 100644
--- a/systems/devel-system-x86_64-zookeeper-server.morph
+++ b/systems/zookeeper-server-x86_64.morph
@@ -1,6 +1,7 @@
-name: devel-system-x86_64-zookeeper-server
+name: zookeeper-server-X86_64
kind: system
-description: A system that is able to build other systems based on the 64-bit x86
+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:
@@ -8,19 +9,9 @@ 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: 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
+- name: zookeeper-server
morph: strata/zookeeper-server.morph
configuration-extensions:
- set-hostname