openstack
/
tripleo-ansible
Code Issues Proposed changes

Merge "BaR: Set default container cli to podman" into stable/train

This commit is contained in:
Zuul 2020-06-11 18:20:59 +00:00 committed by Gerrit Code Review
parent 34b8fccd19 1595782438
commit ccd7be74f0
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tripleo_ansible/roles/backup-and-restore/defaults/main.yml
View File

@ -18,7 +18,7 @@
# All variables intended for modification should place placed in this file.
# Set the container command line entry-point
tripleo_container_cli: "{{ container_cli | default('docker') }}"
tripleo_container_cli: "{{ container_cli | default('podman') }}"
# Stop and start all running services before backup is ran.
tripleo_backup_and_restore_service_manager: true

1
tripleo_ansible/roles/backup-and-restore/molecule/default/playbook.yml
View File

@ -21,6 +21,7 @@
roles:
- role: backup-and-restore
tripleo_backup_and_restore_nfs_server: undercloud
tripleo_container_cli: docker
tripleo_backup_and_restore_rear_simulate: true
tripleo_backup_and_restore_service_manager: false
tripleo_backup_and_restore_hiera_config_file: "{{ ansible_user_dir }}/hiera.yaml"