Browse Source

Ensure those two tasks are compatible with t-h-t import

In t-h-t, we call "tasks_from" in order to exclusively call those two
files in different location.
We therefore need to ensure we actually set the right variables, even in
this case.

Change-Id: Ifbccd663373f0e29301810dcc088b83d968f6203
Related-Bug: #1891465
(cherry picked from commit 11f365d00b)
(cherry picked from commit 5781caccd5)
changes/37/746637/2
Cédric Jeanneret 1 month ago
committed by Cédric Jeanneret (Tengu)
parent
commit
dc963ce0b7
4 changed files with 41 additions and 17 deletions
  1. +32
    -0
      tripleo_ansible/roles/tripleo-podman/tasks/load_vars.yaml
  2. +2
    -17
      tripleo_ansible/roles/tripleo-podman/tasks/main.yml
  3. +4
    -0
      tripleo_ansible/roles/tripleo-podman/tasks/tripleo_docker_purge.yml
  4. +3
    -0
      tripleo_ansible/roles/tripleo-podman/tasks/tripleo_podman_install.yml

+ 32
- 0
tripleo_ansible/roles/tripleo-podman/tasks/load_vars.yaml View File

@@ -0,0 +1,32 @@
---
# Copyright 2019 Red Hat, Inc.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.


# "tripleo_podman" will search for and load any operating system variable file
# found within the "vars/" path. If no OS files are found the task will skip.
# Putting this in a dedicated file allows to just include it wherever is needed.
# Please check https://bugs.launchpad.net/tripleo/+bug/1891465 for more context.
- name: Gather variables for each operating system
include_vars: "{{ item }}"
with_first_found:
- skip: true
files:
- "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml"
- "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
- "{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
- "{{ ansible_distribution | lower }}.yml"
- "{{ ansible_os_family | lower }}-{{ ansible_distribution_version.split('.')[0] }}.yml"
- "{{ ansible_os_family | lower }}.yml"

+ 2
- 17
tripleo_ansible/roles/tripleo-podman/tasks/main.yml View File

@@ -14,23 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.


# "tripleo-podman" will search for and load any operating system variable file

# found within the "vars/" path. If no OS files are found the task will skip.
- name: Gather variables for each operating system
include_vars: "{{ item }}"
with_first_found:
- skip: true
files:
- "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml"
- "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
- "{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
- "{{ ansible_distribution | lower }}.yml"
- "{{ ansible_os_family | lower }}-{{ ansible_distribution_version.split('.')[0] }}.yml"
- "{{ ansible_os_family | lower }}.yml"
tags:
- always
- name: Load vars
import_tasks: load_vars.yaml

- name: Remove docker containers
import_tasks: tripleo_docker_stop.yml


+ 4
- 0
tripleo_ansible/roles/tripleo-podman/tasks/tripleo_docker_purge.yml View File

@@ -14,6 +14,10 @@
# License for the specific language governing permissions and limitations
# under the License.

- name: Load vars if needed
when: tripleo_podman_purge_packages is undefined or tripleo_podman_purge_packages|length == 0
import_tasks: load_vars.yaml

- name: Check if docker has some data
stat:
path: /var/lib/docker


+ 3
- 0
tripleo_ansible/roles/tripleo-podman/tasks/tripleo_podman_install.yml View File

@@ -14,6 +14,9 @@
# License for the specific language governing permissions and limitations
# under the License.

- name: Load vars id needed
when: tripleo_podman_packages is undefined or tripleo_podman_packages|length == 0
import_tasks: load_vars.yaml

- name: Install block
become: true


Loading…
Cancel
Save