Merge "Run container image prepare with operator"

This commit is contained in:
Zuul 2020-04-24 14:08:35 +00:00 committed by Gerrit Code Review
commit 247757b8fe

@ -23,17 +23,33 @@
dest: "{{ working_dir }}/standalone_parameters.yaml"
mode: 0755
- name: Create container parameters script
template:
src: "{{ standalone_container_prep_script }}"
dest: "{{ working_dir }}/standalone-container-prep.sh"
mode: "0755"
- name: Run container prepare legacy
when:
- release in ['queens', 'rocky', 'stein', 'train']
block:
- name: Run container prepare
shell: >
set -o pipefail &&
{{ working_dir }}/standalone-container-prep.sh 2>&1 {{ timestamper_cmd }} > {{ working_dir }}/{{ standalone_container_prep_log }}
changed_when: true
- name: Create container parameters script
template:
src: "{{ standalone_container_prep_script }}"
dest: "{{ working_dir }}/standalone-container-prep.sh"
mode: "0755"
- name: Run container prepare
shell: >
set -o pipefail &&
{{ working_dir }}/standalone-container-prep.sh 2>&1 {{ timestamper_cmd }} > {{ working_dir }}/{{ standalone_container_prep_log }}
changed_when: true
- name: Run container prepare via tripleo-operator-ansible
when:
- release not in ['queens', 'rocky', 'stein', 'train']
collections:
- tripleo.operator
include_role:
name: tripleo_container_image_prepare_default
vars:
tripleo_container_image_prepare_default_debug: true
tripleo_container_image_prepare_default_output_env_file: "{{ working_dir }}/containers-prepare-parameters.yaml"
# update the registry to rdo or docker.io
- name: update registry if needed in container-prepare-parameters.yaml