Merge "[tripleo-podman] Install specific version of buildah"
This commit is contained in:
commit
7b319c736f
@ -24,6 +24,7 @@ tripleo_container_registry_insecure_registries: []
|
|||||||
tripleo_container_registry_login: false
|
tripleo_container_registry_login: false
|
||||||
tripleo_container_registry_logins: {}
|
tripleo_container_registry_logins: {}
|
||||||
tripleo_podman_packages: "{{ _tripleo_podman_packages | default([]) }}"
|
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_purge_packages: "{{ _tripleo_podman_purge_packages | default([]) }}"
|
||||||
tripleo_podman_tls_verify: true
|
tripleo_podman_tls_verify: true
|
||||||
tripleo_podman_unqualified_search_registries:
|
tripleo_podman_unqualified_search_registries:
|
||||||
|
@ -14,12 +14,23 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# 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
|
- name: ensure buildah is installed
|
||||||
become: true
|
become: true
|
||||||
package:
|
package:
|
||||||
name: "buildah"
|
name: "{{ tripleo_buildah_packages }}"
|
||||||
state: latest
|
state: present
|
||||||
|
|
||||||
- name: Perform container registry login(s) with buildah
|
- name: Perform container registry login(s) with buildah
|
||||||
become: true
|
become: true
|
||||||
|
@ -18,6 +18,9 @@
|
|||||||
_tripleo_podman_packages:
|
_tripleo_podman_packages:
|
||||||
- podman-1.6.4
|
- podman-1.6.4
|
||||||
|
|
||||||
|
_tripleo_buildah_packages:
|
||||||
|
- buildah-1.11.6
|
||||||
|
|
||||||
_tripleo_podman_purge_packages:
|
_tripleo_podman_purge_packages:
|
||||||
- docker
|
- docker
|
||||||
- docker-ce
|
- docker-ce
|
||||||
|
Loading…
Reference in New Issue
Block a user