diff options
| author | Jonathan Steffan <jsteffan@fedoraproject.org> | 2015-11-22 19:51:21 -0700 |
|---|---|---|
| committer | Jonathan Steffan <jsteffan@fedoraproject.org> | 2015-11-22 19:51:21 -0700 |
| commit | aa52ca9e12267ce5cf43ebde4782ed6f2fc57150 (patch) | |
| tree | 241fc04cd014b1166650adfd1e97ec5d9a0e5bcb /playbooks | |
| parent | 8e979def0a56b40ab8a3acbd2e1a146457a5aaa6 (diff) | |
| download | openshift-aa52ca9e12267ce5cf43ebde4782ed6f2fc57150.tar.gz openshift-aa52ca9e12267ce5cf43ebde4782ed6f2fc57150.tar.bz2 openshift-aa52ca9e12267ce5cf43ebde4782ed6f2fc57150.tar.xz openshift-aa52ca9e12267ce5cf43ebde4782ed6f2fc57150.zip | |
Update for latest CentOS-7-x86_64-GenericCloud.
- Use xz compressed image
- Update sha256 for new image
- Update docs to reflect new settings
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/libvirt/openshift-cluster/launch.yml | 1 | ||||
| -rw-r--r-- | playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml | 9 | ||||
| -rw-r--r-- | playbooks/libvirt/openshift-cluster/vars.yml | 6 |
3 files changed, 13 insertions, 3 deletions
diff --git a/playbooks/libvirt/openshift-cluster/launch.yml b/playbooks/libvirt/openshift-cluster/launch.yml index 8d7949dd1..acb53440d 100644 --- a/playbooks/libvirt/openshift-cluster/launch.yml +++ b/playbooks/libvirt/openshift-cluster/launch.yml @@ -11,6 +11,7 @@ image_url: "{{ deployment_vars[deployment_type].image.url }}" image_sha256: "{{ deployment_vars[deployment_type].image.sha256 }}" image_name: "{{ deployment_vars[deployment_type].image.name }}" + image_compression: "{{ deployment_vars[deployment_type].image.compression }}" tasks: - fail: msg="Deployment type not supported for libvirt provider yet" when: deployment_type == 'online' diff --git a/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml b/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml index 4825207c9..e1e552c36 100644 --- a/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml +++ b/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml @@ -13,8 +13,15 @@ get_url: url: '{{ image_url }}' sha256sum: '{{ image_sha256 }}' - dest: '{{ os_libvirt_storage_pool_path }}/{{ image_name }}' + dest: '{{ os_libvirt_storage_pool_path }}/{{ [image_name, image_compression] | join(".") }}' when: '{{ ( lookup("oo_option", "skip_image_download") | default("no", True) | lower ) in ["false", "no"] }}' + register: downloaded_image + +- name: Uncompress Base Cloud image + command: 'unxz -kf {{ os_libvirt_storage_pool_path }}/{{ image_name }}.{{ image_compression }}' + args: + creates: '{{ os_libvirt_storage_pool_path }}/{{ image_name }}' + when: image_compression in ["xz"] and downloaded_image.changed - 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 c77a0797e..67cfbcdb8 100644 --- a/playbooks/libvirt/openshift-cluster/vars.yml +++ b/playbooks/libvirt/openshift-cluster/vars.yml @@ -8,11 +8,13 @@ deployment_vars: origin: image: url: "{{ lookup('oo_option', 'image_url') | - default('http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2', True) }}" + default('http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2.xz', True) }}" + compression: "{{ lookup('oo_option', 'image_compression') | + default('xz', True) }}" name: "{{ lookup('oo_option', 'image_name') | default('CentOS-7-x86_64-GenericCloud.qcow2', True) }}" sha256: "{{ lookup('oo_option', 'image_sha256') | - default('e324e3ab1d24a1bbf035ddb365e7f9058c0b454acf48d7aa15c5519fae5998ab', True) }}" + default('9461006300d65172f5668d8875f2aad7b54f7ba4e9c5435d65a84a5a2d66e39b', True) }}" ssh_user: openshift sudo: yes online: |