openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Use role var names from tripleo_podman 

The tripleo_podman role expects these vars to be prefixed with
"tripleo_". Instead of using a different set of vars that don't use a
prefix and having to default the values everywhere, just use the roles
var names, so we can rely on the role setting the right defaults from
its defaults/main.yml[1].

Also, we can avoid having to explicitly pass in vars to later tasks
since they have already been set earlier.

[1] https://opendev.org/openstack/tripleo-ansible/src/branch/master/tripleo_ansible/roles/tripleo_podman/defaults/main.yml

Change-Id: Ia2bb68bcff61cc3a88b32e0a0d99b4a4763160ba
Signed-off-by: James Slagle <jslagle@redhat.com>
This commit is contained in:
James Slagle 2021-07-01 07:54:56 -04:00
parent bc2a0339eb
commit df4c7c8ce1
1 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,51 +86,44 @@ outputs:
- name: Set login facts
no_log: true
set_fact:
container_registry_insecure_registries:
tripleo_container_registry_insecure_registries:
if:
- insecure_registry_is_set
- {get_param: DockerInsecureRegistryAddress}
container_registry_login: {get_param: ContainerImageRegistryLogin}
tripleo_container_registry_login: {get_param: ContainerImageRegistryLogin}
# default that is overwritten by the heat -> dict conversion
container_registry_logins: {}
container_registry_logins_json: {get_param: ContainerImageRegistryCredentials}
container_default_pids_limit: {get_param: ContainerDefaultPidsLimit}
container_events_logger_mechanism: {get_param: ContainerDefaultEventsLogger}
tripleo_container_registry_logins: {}
tripleo_container_registry_logins_json: {get_param: ContainerImageRegistryCredentials}
tripleo_container_default_pids_limit: {get_param: ContainerDefaultPidsLimit}
tripleo_container_events_logger_mechanism: {get_param: ContainerDefaultEventsLogger}
- name: Convert logins json to dict
no_log: true
set_fact:
container_registry_logins: "{{ container_registry_logins_json | from_json }}"
tripleo_container_registry_logins: "{{ tripleo_container_registry_logins_json | from_json }}"
when:
- container_registry_logins_json is string
- container_registry_login | bool
- (container_registry_logins_json | length) > 0
- tripleo_container_registry_logins_json is string
- tripleo_container_registry_login | bool
- (tripleo_container_registry_logins_json | length) > 0
- name: Set registry logins
no_log: true
set_fact:
container_registry_logins: "{{ container_registry_logins_json }}"
tripleo_container_registry_logins: "{{ tripleo_container_registry_logins_json }}"
when:
- container_registry_logins_json is mapping
- container_registry_login | bool
- (container_registry_logins_json | length) > 0
- tripleo_container_registry_logins_json is mapping
- tripleo_container_registry_login | bool
- (tripleo_container_registry_logins_json | length) > 0
- name: Run podman install
include_role:
name: tripleo_podman
tasks_from: tripleo_podman_install.yml
vars:
tripleo_container_registry_insecure_registries: "{{ container_registry_insecure_registries }}"
tripleo_container_default_pids_limit: "{{ container_default_pids_limit }}"
tripleo_container_events_logger_mechanism: "{{ container_events_logger_mechanism }}"
- name: Run podman login
include_role:
name: tripleo_podman
tasks_from: tripleo_podman_login.yml
vars:
tripleo_container_registry_logins: "{{ container_registry_logins }}"
tripleo_container_registry_login: "{{ container_registry_login | bool }}"
- if:
- {get_param: SystemdDropInDependencies}
@ -193,15 +186,13 @@ outputs:
state: present
- name: Set container_registry_insecure_registries fact.
set_fact:
container_registry_insecure_registries:
tripleo_container_registry_insecure_registries:
if:
- insecure_registry_is_set
- {get_param: DockerInsecureRegistryAddress}
- include_role:
name: tripleo_podman
tasks_from: tripleo_podman_install.yml
vars:
tripleo_container_registry_insecure_registries: "{{ container_registry_insecure_registries }}"
- name: system_upgrade_prepare step 2
tags: