openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Add second fact to ensure type safty" into stable/stein

This commit is contained in:
Zuul 2019-10-25 15:13:31 +00:00 committed by Gerrit Code Review
parent 8d95f4f4e3 94ea0b6226
commit 152a0942ff
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deployment/deprecated/docker/docker-baremetal-ansible.yaml
View File

@ -168,6 +168,14 @@ outputs:
set_fact:
container_registry_logins: "{{ container_registry_logins_json | from_json }}"
when:
- container_registry_logins_json is string
- container_registry_login | bool
- (container_registry_logins_json | length) > 0
- name: Set registry logins
set_fact:
container_registry_logins: "{{ container_registry_logins_json }}"
when:
- container_registry_logins_json is mapping
- container_registry_login | bool
- (container_registry_logins_json | length) > 0
- include_role:

9
deployment/podman/podman-baremetal-ansible.yaml
View File

@ -89,6 +89,15 @@ outputs:
set_fact:
container_registry_logins: "{{ container_registry_logins_json | from_json }}"
when:
- container_registry_logins_json is string
- container_registry_login | bool
- (container_registry_logins_json | length) > 0
- name: Set registry logins
set_fact:
container_registry_logins: "{{ container_registry_logins_json }}"
when:
- container_registry_logins_json is mapping
- container_registry_login | bool
- (container_registry_logins_json | length) > 0