Merge "Login with buildah too to allow registry access with buildah" into stable/ussuri
This commit is contained in:
commit
077e9d3ae9
|
@ -15,7 +15,7 @@
|
|||
# under the License.
|
||||
|
||||
|
||||
- name: Perform container registry login(s)
|
||||
- name: Perform container registry login(s) with podman
|
||||
become: true
|
||||
shell: |-
|
||||
podman login --username=$REGISTRY_USERNAME \
|
||||
|
@ -29,3 +29,18 @@
|
|||
no_log: "{{ tripleo_podman_hide_sensitive_logs | bool }}"
|
||||
loop: "{{ query('dict', tripleo_container_registry_logins) }}"
|
||||
register: registry_login_podman
|
||||
|
||||
- name: Perform container registry login(s) with buildah
|
||||
become: true
|
||||
shell: |-
|
||||
buildah login --username=$REGISTRY_USERNAME \
|
||||
--password=$REGISTRY_PASSWORD \
|
||||
--tls-verify={{ tripleo_podman_tls_verify }} \
|
||||
$REGISTRY
|
||||
environment:
|
||||
REGISTRY_USERNAME: "{{ lookup('dict', item.value).key }}"
|
||||
REGISTRY_PASSWORD: "{{ lookup('dict', item.value).value }}"
|
||||
REGISTRY: "{{ item.key }}"
|
||||
no_log: "{{ tripleo_podman_hide_sensitive_logs | bool }}"
|
||||
loop: "{{ query('dict', tripleo_container_registry_logins) }}"
|
||||
register: registry_login_buildah
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
|
||||
_tripleo_podman_packages:
|
||||
- podman
|
||||
- buildah
|
||||
|
||||
_tripleo_podman_purge_packages:
|
||||
- docker
|
||||
|
|
Loading…
Reference in New Issue