summaryrefslogtreecommitdiff
path: root/clusters
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-10-22 11:18:24 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-10-22 16:46:29 +0000
commit42852ef0fb4bec172d84c2253a7fba15ecea4150 (patch)
tree7785e8bc99081a0d7e9cf1c6a20f18c88e900186 /clusters
parent604a8cce7cd46f7d87d1c4b1ce493e76bf2c5fcf (diff)
downloaddefinitions-42852ef0fb4bec172d84c2253a7fba15ecea4150.tar.gz
Rename 'distbuild' system to 'build', and fix descriptions
It's better to have one type of system that can do either distributed or local builds than to have separate ones that must both be kept up to date with changes. The need for a separate 'distbuild' stratum went already: commit 1a7fbedf56a4c7a6afb683851dde5d34bbb48b86 Author: Richard Maw <richard.maw@codethink.co.uk> Date: Thu Oct 2 14:16:00 2014 +0000 Split morph out of tools morph now contains distbuild and morph-cache-server, so the distbuild stratum can go away, and anything that needs it can now use morph.
Diffstat (limited to 'clusters')
-rw-r--r--clusters/example-distbuild-cluster.morph2
-rw-r--r--clusters/mason.morph2
2 files changed, 2 insertions, 2 deletions
diff --git a/clusters/example-distbuild-cluster.morph b/clusters/example-distbuild-cluster.morph
index 4c97d21f..513c16c5 100644
--- a/clusters/example-distbuild-cluster.morph
+++ b/clusters/example-distbuild-cluster.morph
@@ -10,7 +10,7 @@ description: |
workers to authenticate with the Trove to give them read access to
all source repositories.
systems:
-- morph: systems/distbuild-system-x86_64-generic.morph
+- morph: systems/build-system-x86_64.morph
deploy-defaults:
CONTROLLERHOST: build-controller
DISTBUILD_CONTROLLER: false
diff --git a/clusters/mason.morph b/clusters/mason.morph
index 8579f7e4..9717239d 100644
--- a/clusters/mason.morph
+++ b/clusters/mason.morph
@@ -30,7 +30,7 @@ systems:
VCPUS: 2
VERSION_LABEL: 45
WORKER_SSH_PUBKEY: ssh_keys/worker.key.pub
-- morph: systems/distbuild-system-x86_64.morph
+- morph: systems/build-system-x86_64.morph
deploy-defaults:
ARTIFACT_CACHE_SERVER: red-box-v1-trove.example.com
CONTROLLERHOST: red-box-v1-controller.example.com