summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <daniel.silverstone@codethink.co.uk>2014-08-21 15:27:31 (GMT)
committerDaniel Silverstone <daniel.silverstone@codethink.co.uk>2014-08-21 15:27:31 (GMT)
commitffff5a72fd7883e3b396d1f9db696dc8f38d8527 (patch)
tree6ef5cbded3ed387f2f014ebadd6dd799e54fa17e
parent13d084a14439609ddb822b0e1f1c60757ab149fd (diff)
downloaddefinitions-baserock/danielsilverstone/mason-new-kernel.tar.gz
-rw-r--r--clusters/mason.morph2
-rwxr-xr-xmason/mason-generator.sh16
-rwxr-xr-xmason/mason.sh2
3 files changed, 10 insertions, 10 deletions
diff --git a/clusters/mason.morph b/clusters/mason.morph
index 1aa2dad..9bac0bb 100644
--- a/clusters/mason.morph
+++ b/clusters/mason.morph
@@ -49,7 +49,7 @@ systems:
DISK_SIZE: 60G
DISTBUILD_CONTROLLER: true
HOSTNAME: red-box-v1-controller
- MASON_CLUSTER_MORPHOLOGY: ci.morph
+ MASON_CLUSTER_MORPHOLOGY: clusters/ci.morph
MASON_DEFINITIONS_REF: master
MASON_DISTBUILD_ARCH: x86_64
MASON_TEST_HOST: vm-user@vm-host:/vm-path/
diff --git a/mason/mason-generator.sh b/mason/mason-generator.sh
index acc27f3..d93d89f 100755
--- a/mason/mason-generator.sh
+++ b/mason/mason-generator.sh
@@ -48,12 +48,12 @@ sedescape() {
# Key generation
##############################################################################
-mkdir "ssh_keys-${HOST_PREFIX}"
+mkdir -p "ssh_keys-${HOST_PREFIX}"
cd "ssh_keys-${HOST_PREFIX}"
-ssh-keygen -t rsa -b 2048 -f mason.key -C mason@TROVE_HOST -N ''
-ssh-keygen -t rsa -b 2048 -f lorry.key -C lorry@TROVE_HOST -N ''
-ssh-keygen -t rsa -b 2048 -f worker.key -C worker@TROVE_HOST -N ''
-ssh-keygen -t rsa -b 2048 -f id_rsa -C trove-admin@TROVE_HOST -N ''
+test -e mason.key || ssh-keygen -t rsa -b 2048 -f mason.key -C mason@TROVE_HOST -N ''
+test -e lorry.key || ssh-keygen -t rsa -b 2048 -f lorry.key -C lorry@TROVE_HOST -N ''
+test -e worker.key || ssh-keygen -t rsa -b 2048 -f worker.key -C worker@TROVE_HOST -N ''
+test -e id_rsa || ssh-keygen -t rsa -b 2048 -f id_rsa -C trove-admin@TROVE_HOST -N ''
cd ../
@@ -61,7 +61,7 @@ cd ../
# Mason setup
##############################################################################
-cp mason.morph mason-${HOST_PREFIX}.morph
+cp clusters/mason.morph mason-${HOST_PREFIX}.morph
sed -i "s/red-box-v1/$(sedescape "$HOST_PREFIX")/g" "mason-$HOST_PREFIX.morph"
sed -i "s/ssh_keys/ssh_keys-$(sedescape "$HOST_PREFIX")/g" "mason-$HOST_PREFIX.morph"
@@ -76,8 +76,8 @@ sed -i "s/\.example\.com/$(sedescape "$HOST_POSTFIX")/g" "mason-$HOST_PREFIX.mor
# System building
##############################################################################
-morph build trove-system-x86_64
-morph build distbuild-system-x86_64
+morph build systems/trove-system-x86_64.morph
+morph build systems/distbuild-system-x86_64.morph
##############################################################################
diff --git a/mason/mason.sh b/mason/mason.sh
index 2dca7d8..1facd58 100755
--- a/mason/mason.sh
+++ b/mason/mason.sh
@@ -13,7 +13,7 @@ cd ws
definitions_repo="$DEFINITIONS_REF"/"$DISTBUILD_TROVE_ADDRESS"/baserock/baserock/definitions
if [ ! -e "$definitions_repo" ]; then
- morph checkout git://"$DISTBUILD_TROVE_ADDRESS"/baserock/baserock/definitions.git "$DEFINITIONS_REF"
+ morph checkout git://"$DISTBUILD_TROVE_ADDRESS"/baserock/baserock/definitions "$DEFINITIONS_REF"
cd "$definitions_repo"
git config user.name "$TROVE_ID"-mason
git config user.email "$TROVE_ID"-mason@$(hostname)