openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Utilize tripleo-operator for OvercloudImage upload"

This commit is contained in:
Zuul 2021-07-14 14:33:36 +00:00 committed by Gerrit Code Review
parent 8c0f19ae7b 9c6667d915
commit c9676e9115
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
roles/overcloud-prep-images/tasks/overcloud-prep-images.yml
View File

@ -7,13 +7,34 @@
changed_when: true
when: download_overcloud_image|bool
- name: Upload overcloud images
shell: >
set -o pipefail &&
{{ working_dir }}/overcloud-image-upload.sh 2>&1 {{ timestamper_cmd }} >
{{ overcloud_image_upload_log }}
changed_when: true
- name: Upload Overcloud Images
when: step_overcloud_image|bool
block:
- name: Run overcloud image upload - legacy
when:
- release in ['queens', 'stein']
shell: >
set -o pipefail &&
{{ working_dir }}/overcloud-image-upload.sh 2>&1 {{ timestamper_cmd }} >
{{ overcloud_image_upload_log }}
changed_when: true
- name: Run overcloud image upload via tripleo-operator-ansible
when:
- release not in ['queens', 'stein']
collections:
- tripleo.operator
include_role:
name: tripleo_overcloud_image_upload
vars:
tripleo_os_cloud: undercloud
tripleo_overcloud_image_upload_debug: true
tripleo_overcloud_image_upload_generate_scripts: true
tripleo_overcloud_image_upload_http_boot: "{{ containerized_undercloud | default(false) | ternary('/var/lib/ironic/httpboot', None) }}"
tripleo_overcloud_image_upload_whole_disk: "{{ whole_disk_images|default(false) }}"
tripleo_overcloud_image_upload_local: "{{ undercloud_enable_nova|default(false) }}"
tripleo_overcloud_image_upload_log: "{{ overcloud_image_upload_log }}"
tripleo_overcloud_image_upload_log_combine: true
- name: Upload overcloud images with Glance for multinode
shell: >