diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-10-24 10:06:42 +0100 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-10-24 10:06:42 +0100 |
commit | 725b998aa023d6b04a7d8141609c8448d4d82098 (patch) | |
tree | 1b6822e4148dd746abd8a88a5adb3064884d739d /clusters/mason.morph | |
parent | 826f0cff22511204a1fde979e954469852227646 (diff) | |
parent | 1a542e3e3d8831add80f2c1f5a4390fc0170e9e5 (diff) | |
download | definitions-725b998aa023d6b04a7d8141609c8448d4d82098.tar.gz |
Merge remote-tracking branch 'origin/baserock/sam/build-and-devel-systems'
Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
Reviewed-By: Daniel Silverstone <daniel.silverstone@codethink.co.uk>
Diffstat (limited to 'clusters/mason.morph')
-rw-r--r-- | clusters/mason.morph | 2 |
1 files changed, 1 insertions, 1 deletions
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 |