summaryrefslogtreecommitdiff
path: root/clusters/mason-openstack.morph
diff options
context:
space:
mode:
authorAdam Coldrick <adam.coldrick@codethink.co.uk>2015-06-02 14:01:55 +0000
committerAdam Coldrick <adam.coldrick@codethink.co.uk>2015-06-02 14:01:55 +0000
commitc6abc426b5857f9b1edd9c72e3094c1e2df8a7bf (patch)
treeeff61e6fe9bb3adcf254c4e86eebca7190c65cce /clusters/mason-openstack.morph
parent4f43fdd08770c113f7443fecbda43d4316091d4b (diff)
parent02faf51e91a8c55adfbb6d953bca354ab99bf261 (diff)
downloaddefinitions-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-openstack.morph')
-rw-r--r--clusters/mason-openstack.morph4
1 files changed, 2 insertions, 2 deletions
diff --git a/clusters/mason-openstack.morph b/clusters/mason-openstack.morph
index 6ef14888..935e2496 100644
--- a/clusters/mason-openstack.morph
+++ b/clusters/mason-openstack.morph
@@ -10,7 +10,7 @@ systems:
CONTROLLERHOST: controller-hostname
DISTBUILD_CONTROLLER: true
DISTBUILD_WORKER: true
- INSTALL_FILES: distbuild/manifest
+ INSTALL_FILES: install-files/distbuild/manifest
RAM_SIZE: 8G
TROVE_HOST: your-upstream-trove
TROVE_ID: your-upstream-trove-prefix
@@ -18,7 +18,7 @@ systems:
WORKER_SSH_KEY: ssh-keys/worker.key
deploy:
mason-openstack:
- type: openstack
+ type: extensions/openstack
location: openstack-auth-url (eg example.com:5000/v2.0)
DISK_SIZE: 6G
DISTBUILD_CONTROLLER: true