diff options
| author | Lénaïc Huard <lhuard@amadeus.com> | 2015-06-07 23:08:55 +0200 |
|---|---|---|
| committer | Lénaïc Huard <lhuard@amadeus.com> | 2015-07-03 14:55:38 +0200 |
| commit | 3c48b582bf63fdf46efb2eb644f3adac313ffd6d (patch) | |
| tree | f212041aec1e3fb42b0f7932344111997c9f6ea4 /playbooks/libvirt | |
| parent | 6ae88062163562c8b67090c0522596a2c0c9fd51 (diff) | |
| download | openshift-3c48b582bf63fdf46efb2eb644f3adac313ffd6d.tar.gz openshift-3c48b582bf63fdf46efb2eb644f3adac313ffd6d.tar.bz2 openshift-3c48b582bf63fdf46efb2eb644f3adac313ffd6d.tar.xz openshift-3c48b582bf63fdf46efb2eb644f3adac313ffd6d.zip | |
Add a generic mechanism for passing options
And use it in the libvirt and openstack playbooks
Diffstat (limited to 'playbooks/libvirt')
| l--------- | playbooks/libvirt/openshift-cluster/lookup_plugins | 1 | ||||
| -rw-r--r-- | playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml | 1 | ||||
| -rw-r--r-- | playbooks/libvirt/openshift-cluster/vars.yml | 9 |
3 files changed, 8 insertions, 3 deletions
diff --git a/playbooks/libvirt/openshift-cluster/lookup_plugins b/playbooks/libvirt/openshift-cluster/lookup_plugins new file mode 120000 index 000000000..ac79701db --- /dev/null +++ b/playbooks/libvirt/openshift-cluster/lookup_plugins @@ -0,0 +1 @@ +../../../lookup_plugins
\ No newline at end of file diff --git a/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml b/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml index 8291192ab..4cb494056 100644 --- a/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml +++ b/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml @@ -14,6 +14,7 @@ url: '{{ image_url }}' sha256sum: '{{ image_sha256 }}' dest: '{{ os_libvirt_storage_pool_path }}/{{ image_name }}' + when: '{{ ( lookup("oo_option", "skip_image_download") | default("no", True) | lower ) in ["false", "no"] }}' - name: Create the cloud-init config drive path file: diff --git a/playbooks/libvirt/openshift-cluster/vars.yml b/playbooks/libvirt/openshift-cluster/vars.yml index 65d954fee..e3c8cd8d0 100644 --- a/playbooks/libvirt/openshift-cluster/vars.yml +++ b/playbooks/libvirt/openshift-cluster/vars.yml @@ -7,9 +7,12 @@ libvirt_uri: 'qemu:///system' deployment_vars: origin: image: - url: "http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2" - name: CentOS-7-x86_64-GenericCloud.qcow2 - sha256: e324e3ab1d24a1bbf035ddb365e7f9058c0b454acf48d7aa15c5519fae5998ab + url: "{{ lookup('oo_option', 'image_url') | + default('http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2', True) }}" + name: "{{ lookup('oo_option', 'image_name') | + default('CentOS-7-x86_64-GenericCloud.qcow2', True) }}" + sha256: "{{ lookup('oo_option', 'image_sha256') | + default('e324e3ab1d24a1bbf035ddb365e7f9058c0b454acf48d7aa15c5519fae5998ab', True) }}" ssh_user: openshift sudo: yes online: |