diff options
| author | Tomas Sedovic <tomas@sedovic.cz> | 2017-08-04 15:26:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-04 15:26:35 +0200 |
| commit | e4cb854086c845fa301cddaefcba1e3accaa17d8 (patch) | |
| tree | 2bc5157707f03240807a635702d4696304511cd6 | |
| parent | 8734927bf2157d155f0042db0700df433ac05275 (diff) | |
| download | openshift-e4cb854086c845fa301cddaefcba1e3accaa17d8.tar.gz openshift-e4cb854086c845fa301cddaefcba1e3accaa17d8.tar.bz2 openshift-e4cb854086c845fa301cddaefcba1e3accaa17d8.tar.xz openshift-e4cb854086c845fa301cddaefcba1e3accaa17d8.zip | |
Allow using ephemeral volumes for docker storage (#615)
For testing cases it's sometimes useful to not create Cinder volumes for
the VMs. It can also sometimes be a little faster and more robust (but
unfit for production).
This adds an option called `ephemeral_volumes` that will use the VM's
storage instead of creating volumes when set to true.
3 files changed, 9 insertions, 0 deletions
diff --git a/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml b/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml index 6d07f9b56..8f337546c 100644 --- a/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml +++ b/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml @@ -78,3 +78,8 @@ ansible_user: openshift #openstack_private_ssh_key: ~/.ssh/openshift # # The path for the SSH config to access all nodes #openstack_ssh_config_path: /tmp/ssh.config.openshift.ansible.{{ env_id }}.{{ public_dns_domain }} + + +# If you want to use the VM storage instead of Cinder volumes, set this to `true`. +# NOTE: this is for testing only! Your data will be gone once the VM disappears! +# ephemeral_volumes: false diff --git a/roles/openstack-stack/templates/heat_stack_server.yaml.j2 b/roles/openstack-stack/templates/heat_stack_server.yaml.j2 index 5851d3b9b..85af311ec 100644 --- a/roles/openstack-stack/templates/heat_stack_server.yaml.j2 +++ b/roles/openstack-stack/templates/heat_stack_server.yaml.j2 @@ -156,6 +156,7 @@ resources: floating_network: { get_param: floating_network } port_id: { get_resource: port } +{% if not ephemeral_volumes|default(false)|bool %} cinder_volume: type: OS::Cinder::Volume properties: @@ -168,3 +169,4 @@ resources: volume_id: { get_resource: cinder_volume } instance_uuid: { get_resource: server } mountpoint: /dev/sdb +{% endif %} diff --git a/roles/openstack-stack/templates/heat_stack_server_nofloating.yaml.j2 b/roles/openstack-stack/templates/heat_stack_server_nofloating.yaml.j2 index 792a8b90c..a22b7c6d0 100644 --- a/roles/openstack-stack/templates/heat_stack_server_nofloating.yaml.j2 +++ b/roles/openstack-stack/templates/heat_stack_server_nofloating.yaml.j2 @@ -135,6 +135,7 @@ resources: - subnet: { get_param: subnet } security_groups: { get_param: secgrp } +{% if not ephemeral_volumes|default(false)|bool %} cinder_volume: type: OS::Cinder::Volume properties: @@ -147,3 +148,4 @@ resources: volume_id: { get_resource: cinder_volume } instance_uuid: { get_resource: server_nofloating } mountpoint: /dev/sdb +{% endif %} |