diff options
| author | Firehose merge bot <firehose@merge.bot> | 2015-09-15 09:08:03 +0000 |
|---|---|---|
| committer | Firehose merge bot <firehose@merge.bot> | 2015-09-15 09:08:03 +0000 |
| commit | 35d2ba0c2b7e6957b85b34b89985b8b45898cf84 (patch) | |
| tree | 27d2874563e08e20f645ff094e28ea4980478c21 /clusters/mason-openstack.morph | |
| parent | 308d8b3ea55fb81eb8fdd81c37d0352f4b74edd0 (diff) | |
| download | definitions-35d2ba0c2b7e6957b85b34b89985b8b45898cf84.tar.gz | |
Firehose test commit
Diffstat (limited to 'clusters/mason-openstack.morph')
| -rw-r--r-- | clusters/mason-openstack.morph | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clusters/mason-openstack.morph b/clusters/mason-openstack.morph index cc7c1d4d..6ef14888 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: install-files/distbuild/manifest + 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: extensions/openstack + type: openstack location: openstack-auth-url (eg example.com:5000/v2.0) DISK_SIZE: 6G DISTBUILD_CONTROLLER: true @@ -34,6 +34,6 @@ systems: OPENSTACK_TENANT_ID: 7d7ebfe23367490b973a10fa426c3aec OPENSTACK_IMAGENAME: mason-openstack OPENSTACK_NETWORK_ID: 71f5151a-b7c3-405d-a841-d1b07e5db099 - CLOUD_INIT: true + CLOUD_INIT: yes KERNEL_ARGS: console=ttyS0 console=tty0 TEST_INFRASTRUCTURE_TYPE: openstack |