Remove podman_version fact and conditional from undercloud-deploy
This was added in [1] but no longer needed. The fact is not consumed
anywhere else [2], the branches mentioned are EOL and podman is now
on v3.0 in train e.g. [3].
The conditional is causing problems for the mixed os job in [4]
because we include_tasks and not the whole undercloud-deploy role to
regenerate the containers prepare file.
[1] 9d31d8996c
[2] https://codesearch.opendev.org/?q=podman_version
[3] https://logserver.rdoproject.org/openstack-periodic-integration-stable4/opendev.org/openstack/tripleo-ci/master/periodic-tripleo-ci-centos-8-containers-multinode-train/5dc578c/logs/undercloud/var/log/extra/package-list-installed.txt.gz
[4] https://logserver.rdoproject.org/34/44234/1/check/periodic-tripleo-ci-centos-8-9-multinode-mixed-os/2892353/job-output.txt
Change-Id: Iab4776bb71e37bacae77e678484b2a1f308573db
This commit is contained in:
parent
ecfc3c8873
commit
b1685977ef
|
@ -4,26 +4,6 @@
|
|||
gather_subset: "!min,distribution"
|
||||
when: ansible_distribution is not defined
|
||||
|
||||
- name: Run podman --version
|
||||
command: podman --version
|
||||
ignore_errors: true
|
||||
register: podman_ver
|
||||
tags:
|
||||
- undercloud-install
|
||||
changed_when: false
|
||||
|
||||
|
||||
- name: Set fact for podman version
|
||||
set_fact:
|
||||
podman_version: >-
|
||||
{%- if podman_ver is success -%}
|
||||
{{ podman_ver.stdout | replace("podman version ", "") }}
|
||||
{%- else -%}0.0
|
||||
{%- endif -%}
|
||||
tags:
|
||||
- undercloud-install
|
||||
|
||||
|
||||
- include: novajoin_prep.yml
|
||||
when: enable_tls_everywhere|bool and prepare_ipa|bool and undercloud_enable_novajoin|bool
|
||||
tags:
|
||||
|
|
|
@ -35,9 +35,7 @@ parameter_defaults:
|
|||
modify_vars:
|
||||
tasks_from: yum_update.yml
|
||||
yum_repos_dir_path: /etc/yum.repos.d
|
||||
{% if release not in ['pike','queens','stein'] and podman_version is version('1.5.0', '>=') %}
|
||||
yum_cache: /var/tmp/tripleo-container-image-prepare-cache
|
||||
{% endif %}
|
||||
update_repo: "{{ update_containers_repo }}"
|
||||
{% if release not in ['newton', 'ocata', 'pike', 'queens'] %}
|
||||
container_build_tool: buildah
|
||||
|
|
Loading…
Reference in New Issue