From f45695be540c58314ab30847318ab3cb9b861524 Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Fri, 22 Aug 2014 13:01:39 +0000
Subject: Deploy Masons to use source on upstream troves

The per-mason trove only needs to worry about being an artifact cache,
so we can prevent it populating itself from the upstream trove by making
it use the SSH protocol for fetching sources, and not registering its
ssh key with the upstream trove.

The MASON_UPSTREAM_TROVE_ADDRESS option has been removed, as this is now
the TROVE_HOST.

The distbuild network is now configured to use the upstream trove for
sources, and the local trove for artifacts, with the
ARTIFACT_CACHE_SERVER option.

mason.configure now uses ARTIFACT_CACHE_SERVER to tell deploy commands
which server to fetch artifacts from.
---
 mason.configure | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'mason.configure')

diff --git a/mason.configure b/mason.configure
index fb73b01c..90d49709 100644
--- a/mason.configure
+++ b/mason.configure
@@ -19,8 +19,8 @@
 # a Mason instance at deployment time. It uses the following variables
 # from the environment:
 #
+#   * ARTIFACT_CACHE_SERVER
 #   * MASON_CLUSTER_MORPHOLOGY
-#   * MASON_UPSTREAM_TROVE_ADDRESS
 #   * MASON_DEFINITIONS_REF
 #   * MASON_DISTBUILD_ARCH
 #   * MASON_TEST_HOST
@@ -32,8 +32,8 @@ set -e
 
 ROOT="$1"
 
-if [ "$MASON_CLUSTER_MORPHOLOGY" = "" \
-     -o "$MASON_UPSTREAM_TROVE_ADDRESS" = "" \
+if [ "$ARTIFACT_CACHE_SERVER" = "" \
+     -o "$MASON_CLUSTER_MORPHOLOGY" = "" \
      -o "$MASON_DEFINITIONS_REF" = "" \
      -o "$MASON_DISTBUILD_ARCH" = "" \
      -o "$MASON_TEST_HOST" = "" ]; then
@@ -61,11 +61,11 @@ echo "Creating $MASON_CONFIG"
 cat >>"$MASON_CONFIG" <<EOF
 #################### START OF DEPLOY TIME CONFIGURATION #######################
 
-UPSTREAM_TROVE_ADDRESS=$(shellescape "$MASON_UPSTREAM_TROVE_ADDRESS")
+ARTIFACT_CACHE_SERVER=$(shellescape "$ARTIFACT_CACHE_SERVER")
+UPSTREAM_TROVE_ADDRESS=$(shellescape "$TROVE_HOST")
 DEFINITIONS_REF=$(shellescape "$MASON_DEFINITIONS_REF")
 DISTBUILD_ARCH=$(shellescape "$MASON_DISTBUILD_ARCH")
 DISTBUILD_CONTROLLER_ADDRESS=$(shellescape "$CONTROLLERHOST")
-DISTBUILD_TROVE_ADDRESS=$(shellescape "$TROVE_HOST")
 TROVE_ID=$(shellescape "$TROVE_ID")
 BUILD_CLUSTER_MORPHOLOGY=$(shellescape "$MASON_CLUSTER_MORPHOLOGY")
 TEST_VM_HOST_SSH_URL=$(shellescape "$MASON_TEST_HOST")
-- 
cgit v1.2.1