diff options
| author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2015-06-02 14:01:55 +0000 |
|---|---|---|
| committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2015-06-02 14:01:55 +0000 |
| commit | c6abc426b5857f9b1edd9c72e3094c1e2df8a7bf (patch) | |
| tree | eff61e6fe9bb3adcf254c4e86eebca7190c65cce /clusters/mason.morph | |
| parent | 4f43fdd08770c113f7443fecbda43d4316091d4b (diff) | |
| parent | 02faf51e91a8c55adfbb6d953bca354ab99bf261 (diff) | |
| download | definitions-c6abc426b5857f9b1edd9c72e3094c1e2df8a7bf.tar.gz | |
Merge branch 'baserock/adamcoldrick/all-exts-in-definitions-v2'
Reviewed-by: Richard Maw <richard.maw@codethink.co.uk>
Diffstat (limited to 'clusters/mason.morph')
| -rw-r--r-- | clusters/mason.morph | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clusters/mason.morph b/clusters/mason.morph index 9717239d..376cf337 100644 --- a/clusters/mason.morph +++ b/clusters/mason.morph @@ -11,7 +11,7 @@ systems: - morph: systems/trove-system-x86_64.morph deploy: red-box-v1-trove: - type: kvm + type: extensions/kvm location: kvm+ssh://vm-user@vm-host/red-box-v1-trove/vm-path/red-box-v1-trove.img AUTOSTART: true DISK_SIZE: 20G @@ -36,7 +36,7 @@ systems: CONTROLLERHOST: red-box-v1-controller.example.com DISTBUILD_CONTROLLER: false DISTBUILD_WORKER: true - INSTALL_FILES: distbuild/manifest + INSTALL_FILES: install-files/distbuild/manifest RAM_SIZE: 8G TROVE_HOST: upstream-trove TROVE_ID: upstream-trove @@ -44,7 +44,7 @@ systems: WORKER_SSH_KEY: ssh_keys/worker.key deploy: red-box-v1-controller: - type: kvm + type: extensions/kvm location: kvm+ssh://vm-user@vm-host/red-box-v1-controller/vm-path/red-box-v1-controller.img DISK_SIZE: 60G DISTBUILD_CONTROLLER: true |