From 93a5b5e55d60378aba9c7444285f98983431356e Mon Sep 17 00:00:00 2001
From: Richard Ipsum <richard.ipsum@codethink.co.uk>
Date: Tue, 1 Jul 2014 16:35:45 +0000
Subject: Fix distbuild workers when TROVE_HOST is not TROVE_ID

---
 distbuild.configure | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/distbuild.configure b/distbuild.configure
index 1572388e..e565085b 100644
--- a/distbuild.configure
+++ b/distbuild.configure
@@ -43,7 +43,7 @@ set -e
 # If ARTIFACT_CACHE_SERVER isn't set, default to $TROVE_ID.
 if [ "x$ARTIFACT_CACHE_SERVER" = x ]
 then
-    ARTIFACT_CACHE_SERVER="$TROVE_ID"
+    ARTIFACT_CACHE_SERVER="$TROVE_HOST"
 fi
 
 set -u
@@ -67,14 +67,14 @@ log = /var/log/morph.log
 log-max = 100M
 cachedir = /srv/distbuild
 tempdir = /srv/distbuild/tmp
-trove-host = $TROVE_ID
+trove-host = $TROVE_HOST
 trove-id = $TROVE_ID
 controller-initiator-address = $CONTROLLERHOST
 tempdir-min-space = 4G
 cachedir-min-space = 4G
 build-ref-prefix = $TROVE_ID
-artifact-cache-server = http://${ARTIFACT_CACHE_SERVER}:8080/
-git-resolve-cache-server = http://${TROVE_ID}:8080/
+artifact-cache-server = http://$ARTIFACT_CACHE_SERVER:8080/
+git-resolve-cache-server = http://$TROVE_HOST:8080/
 EOF
 
 
@@ -90,7 +90,7 @@ then
 [config]
 log = /var/log/morph-controller.log
 log-max = 100M
-writeable-cache-server = http://${ARTIFACT_CACHE_SERVER}:8081/
+writeable-cache-server = http://$ARTIFACT_CACHE_SERVER:8081/
 worker = $WORKERS
 controller-helper-address = 127.0.0.1
 EOF
@@ -125,7 +125,7 @@ EOF
 
     # This will be used for a systemd generator which 
     # nfs mounts the ccache from the trove
-    echo "$TROVE_ID" > "$1/etc/trove-host"
+    echo "$TROVE_HOST" > "$1/etc/trove-host"
 
     # Configuration for the controller's helper process. This
     # gets used by the systemd unit that starts the helper.
-- 
cgit v1.2.1