summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2014-05-29 16:34:49 (GMT)
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2014-05-29 16:34:49 (GMT)
commit4daed997c1f458e7b3557c86b533b49de23eeb05 (patch)
tree4b8b72007171d2724e8c104830d56bc4ad1d3f91
parent64672152963409d496527e270eb199f5e3321e59 (diff)
parent0f6b6b47fa0f7e9b79fa6a54658fa6c7f59b3adf (diff)
downloaddefinitions-4daed997c1f458e7b3557c86b533b49de23eeb05.tar.gz
Merge remote-tracking branch 'origin/baserock/liw/gbo-deployments'
Reviewed-by: Sam Thursfield Reviewed-by: Richard Maw
-rw-r--r--trove-system-x86_64.morph1
-rw-r--r--trove.baserock.org-upgrade.morph23
-rwxr-xr-xtrove.configure11
3 files changed, 31 insertions, 4 deletions
diff --git a/trove-system-x86_64.morph b/trove-system-x86_64.morph
index f0ae109..d599d4b 100644
--- a/trove-system-x86_64.morph
+++ b/trove-system-x86_64.morph
@@ -1,5 +1,6 @@
arch: x86_64
configuration-extensions:
+- set-hostname
- trove
- nfsboot-server
- trove-backup
diff --git a/trove.baserock.org-upgrade.morph b/trove.baserock.org-upgrade.morph
new file mode 100644
index 0000000..1a23a97
--- /dev/null
+++ b/trove.baserock.org-upgrade.morph
@@ -0,0 +1,23 @@
+kind: cluster
+name: gbo-upgrade
+description: |
+ This is a cluster morphology for deploying an UPGRADE to
+ git.baserock.org. It doesn't work for the initial deployment. The
+ deployer MUST have ssh access to root@git.baserock.org. To use:
+
+ morph deploy --upgrade gbo-cluster gbo.VERSION_LABEL=2014-05-29
+
+ Replace the value of gbo.VERSION_LABEL above with the current date.
+ You can add letters if you need to upgrade multiple times in a day.
+systems:
+- morph: trove-system-x86_64
+ deploy:
+ gbo:
+ type: ssh-rsync
+ location: root@git.baserock.org
+ LORRY_CONTROLLER_MINIONS: 4
+ HOSTNAME: firehose1
+ FSTAB_HOME: LABEL=homes /home auto defaults,noatime,rw 0 2
+ TROVE_ID: baserock
+ TROVE_HOSTNAME: git.baserock.org
+ TROVE_COMPANY: Baserock
diff --git a/trove.configure b/trove.configure
index 1851e38..a4000e4 100755
--- a/trove.configure
+++ b/trove.configure
@@ -20,6 +20,7 @@
# from the environment (see MUSTARD for a description of them):
#
# * TROVE_ID
+# * TROVE_HOSTNAME (optional, defaults to TROVE_ID)
# * TROVE_COMPANY
# * LORRY_SSH_KEY
# * UPSTREAM_TROVE
@@ -42,13 +43,15 @@ set -e
ROOT="$1"
+if [ -z "$TROVE_HOSTNAME" ]
+then
+ export TROVE_HOSTNAME="$TROVE_ID"
+fi
+
##########################################################################
# Configuration in /etc, which we need to do on all deployments.
##########################################################################
-echo "Set hostname to $TROVE_ID"
-echo "$TROVE_ID" > "$ROOT/etc/hostname"
-
##########################################################################
lua_escape()
@@ -59,7 +62,7 @@ lua_escape()
echo "Creating /etc/trove-setup.sed"
cat <<EOF > "$ROOT"/etc/trove-setup.sed
-s/##TROVE_HOSTNAME##/$TROVE_ID/g
+s/##TROVE_HOSTNAME##/$TROVE_HOSTNAME/g
s/##MASON_HOST##/$MASON_ID/g
s/##MASON_PORT##/18755/g
s/##TROVE_TITLE##/$TROVE_ID/g