summaryrefslogtreecommitdiff
path: root/clusters/mason.morph
diff options
context:
space:
mode:
Diffstat (limited to 'clusters/mason.morph')
-rw-r--r--clusters/mason.morph9
1 files changed, 4 insertions, 5 deletions
diff --git a/clusters/mason.morph b/clusters/mason.morph
index 9bac0bbc..fd8c25d7 100644
--- a/clusters/mason.morph
+++ b/clusters/mason.morph
@@ -27,19 +27,19 @@ systems:
TROVE_HOST: red-box-v1
TROVE_ID: red-box-v1-trove
UPSTREAM_TROVE: upstream-trove
- UPSTREAM_TROVE_PROTOCOL: http
VCPUS: 2
VERSION_LABEL: 45
WORKER_SSH_PUBKEY: ssh_keys/worker.key.pub
- morph: systems/distbuild-system-x86_64.morph
deploy-defaults:
- CONTROLLERHOST: red-box-v1-controller
+ ARTIFACT_CACHE_SERVER: red-box-v1-trove.example.com
+ CONTROLLERHOST: red-box-v1-controller.example.com
DISTBUILD_CONTROLLER: false
DISTBUILD_WORKER: true
INSTALL_FILES: distbuild/manifest
RAM_SIZE: 8G
- TROVE_HOST: red-box-v1-trove.example.com
- TROVE_ID: red-box-v1-trove
+ TROVE_HOST: upstream-trove
+ TROVE_ID: upstream-trove
VCPUS: 2
WORKER_SSH_KEY: ssh_keys/worker.key
deploy:
@@ -53,5 +53,4 @@ systems:
MASON_DEFINITIONS_REF: master
MASON_DISTBUILD_ARCH: x86_64
MASON_TEST_HOST: vm-user@vm-host:/vm-path/
- MASON_UPSTREAM_TROVE_ADDRESS: upstream-trove
WORKERS: red-box-v1-controller