Merge "Do not hard-code vars_from" into stable/train

This commit is contained in:
Zuul 2020-08-21 03:37:01 +00:00 committed by Gerrit Code Review
commit 7550575805
1 changed files with 0 additions and 2 deletions

View File

@ -106,7 +106,6 @@ outputs:
include_role: include_role:
name: tripleo-podman name: tripleo-podman
tasks_from: tripleo_podman_install.yml tasks_from: tripleo_podman_install.yml
vars_from: "redhat.yml"
vars: vars:
tripleo_container_registry_insecure_registries: "{{ container_registry_insecure_registries }}" tripleo_container_registry_insecure_registries: "{{ container_registry_insecure_registries }}"
@ -179,7 +178,6 @@ outputs:
- include_role: - include_role:
name: tripleo-podman name: tripleo-podman
tasks_from: tripleo_podman_install.yml tasks_from: tripleo_podman_install.yml
vars_from: "redhat.yml"
vars: vars:
tripleo_container_registry_insecure_registries: "{{ container_registry_insecure_registries }}" tripleo_container_registry_insecure_registries: "{{ container_registry_insecure_registries }}"