Browse Source

Merge "[tripleo-podman] Install specific version of buildah"

tags/1.7.0
Zuul 1 month ago
committed by Gerrit Code Review
parent
commit
7b319c736f
3 changed files with 17 additions and 2 deletions
  1. +1
    -0
      tripleo_ansible/roles/tripleo_podman/defaults/main.yml
  2. +13
    -2
      tripleo_ansible/roles/tripleo_podman/tasks/tripleo_podman_buildah_login.yml
  3. +3
    -0
      tripleo_ansible/roles/tripleo_podman/vars/redhat.yml

+ 1
- 0
tripleo_ansible/roles/tripleo_podman/defaults/main.yml View File

@@ -24,6 +24,7 @@ tripleo_container_registry_insecure_registries: []
tripleo_container_registry_login: false
tripleo_container_registry_logins: {}
tripleo_podman_packages: "{{ _tripleo_podman_packages | default([]) }}"
tripleo_buildah_packages: "{{ _tripleo_buildah_packages | default([]) }}"
tripleo_podman_purge_packages: "{{ _tripleo_podman_purge_packages | default([]) }}"
tripleo_podman_tls_verify: true
tripleo_podman_unqualified_search_registries:


+ 13
- 2
tripleo_ansible/roles/tripleo_podman/tasks/tripleo_podman_buildah_login.yml View File

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

- name: Gather variables for each operating system for installing buildah
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"

- name: ensure buildah is installed
become: true
package:
name: "buildah"
state: latest
name: "{{ tripleo_buildah_packages }}"
state: present

- name: Perform container registry login(s) with buildah
become: true


+ 3
- 0
tripleo_ansible/roles/tripleo_podman/vars/redhat.yml View File

@@ -18,6 +18,9 @@
_tripleo_podman_packages:
- podman-1.6.4

_tripleo_buildah_packages:
- buildah-1.11.6

_tripleo_podman_purge_packages:
- docker
- docker-ce

Loading…
Cancel
Save