openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Use renamed task files for podman."

This commit is contained in:
Zuul 2022-11-28 15:51:39 +00:00 committed by Gerrit Code Review
parent dfbcf7aa83 c36313639d
commit 00871be56f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment/metrics/collectd-container-puppet.yaml
View File

@ -629,7 +629,7 @@ outputs:
- name: create podman socket for sensubility purposes
include_role:
name: tripleo_podman
tasks_from: tripleo_podman_service
tasks_from: service
vars:
tripleo_podman_socket_path: /var/lib/tripleo-podman/collectd/podman.sock
when:
@ -638,9 +638,9 @@ outputs:
- name: remove rsyslog configuration for podman healthcheck log
include_role:
name: tripleo_podman
tasks_from: tripleo_podman_rsyslog_cleanup
tasks_from: rsyslog_cleanup
upgrade_tasks:
- name: remove rsyslog configuration for podman healthcheck log
include_role:
name: tripleo_podman
tasks_from: tripleo_podman_rsyslog_cleanup
tasks_from: rsyslog_cleanup

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

@ -122,12 +122,12 @@ outputs:
- name: Run podman install
include_role:
name: tripleo_podman
tasks_from: tripleo_podman_install.yml
tasks_from: install.yml
- name: Run podman login
include_role:
name: tripleo_podman
tasks_from: tripleo_podman_login.yml
tasks_from: login.yml
- if:
- {get_param: SystemdDropInDependencies}
@ -198,7 +198,7 @@ outputs:
- {get_param: DockerInsecureRegistryAddress}
- include_role:
name: tripleo_podman
tasks_from: tripleo_podman_install.yml
tasks_from: install.yml
- name: system_upgrade_prepare step 2
tags:
@ -241,7 +241,7 @@ outputs:
- deployment_source_hosts not in group_names
include_role:
name: tripleo_podman
tasks_from: tripleo_podman_purge.yml
tasks_from: purge.yml
vars:
deployment_source_hosts: {get_param: deployment_source_hosts}
@ -258,6 +258,6 @@ outputs:
- deployment_source_hosts not in group_names
include_role:
name: tripleo_podman
tasks_from: tripleo_podman_purge.yml
tasks_from: purge.yml
vars:
deployment_source_hosts: {get_param: deployment_source_hosts}