diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-07-06 14:31:07 -0400 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-07-06 14:31:07 -0400 |
| commit | a7f98a0b8c19d7d20c2e9761104ca24affbbb249 (patch) | |
| tree | 27c3a08e9771230ee66a4a665ca5e3f2d3e3343d /playbooks/libvirt | |
| parent | 80ea7241e019c1881bf8b536b8606f8ef22c583d (diff) | |
| parent | 3c48b582bf63fdf46efb2eb644f3adac313ffd6d (diff) | |
| download | openshift-a7f98a0b8c19d7d20c2e9761104ca24affbbb249.tar.gz openshift-a7f98a0b8c19d7d20c2e9761104ca24affbbb249.tar.bz2 openshift-a7f98a0b8c19d7d20c2e9761104ca24affbbb249.tar.xz openshift-a7f98a0b8c19d7d20c2e9761104ca24affbbb249.zip | |
Merge pull request #269 from lhuard1A/oo_option
Add a generic mechanism for passing options
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: |