diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-08-28 10:02:57 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-08-28 10:02:57 +0000 |
| commit | 529cf76e1a276e6324ffa38eef71dcf7d700ad12 (patch) | |
| tree | 466be2587f655aea12ae426fa2345f928e401464 /clusters/mason.morph | |
| parent | 864cb7fe28e99f9bfec955e929e29dbd4d1045dd (diff) | |
| parent | e3097bdcc35588f4a7dcc99e399b0b492d9e12f4 (diff) | |
| download | definitions-529cf76e1a276e6324ffa38eef71dcf7d700ad12.tar.gz | |
Merge branch 'baserock/richardmaw/mason-loop-time'
Reviewed-by: Sam Thursfield
Reviewed-by: Michael Drake
Diffstat (limited to 'clusters/mason.morph')
| -rw-r--r-- | clusters/mason.morph | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/clusters/mason.morph b/clusters/mason.morph index 1aa2dadb..8579f7e4 100644 --- a/clusters/mason.morph +++ b/clusters/mason.morph @@ -14,7 +14,7 @@ systems: type: kvm location: kvm+ssh://vm-user@vm-host/red-box-v1-trove/vm-path/red-box-v1-trove.img AUTOSTART: true - DISK_SIZE: 100G + DISK_SIZE: 20G HOSTNAME: red-box-v1-trove LORRY_SSH_KEY: ssh_keys/lorry.key MASON_SSH_PUBKEY: ssh_keys/mason.key.pub @@ -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: @@ -49,9 +49,8 @@ systems: DISK_SIZE: 60G DISTBUILD_CONTROLLER: true HOSTNAME: red-box-v1-controller - MASON_CLUSTER_MORPHOLOGY: ci.morph + MASON_CLUSTER_MORPHOLOGY: clusters/ci.morph 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 |