From 1595782438bd63b4fc6e7e00ac8a96228f64b15f Mon Sep 17 00:00:00 2001 From: Juan Badia Payno Date: Mon, 1 Jun 2020 11:15:57 +0200 Subject: [PATCH] BaR: Set default container cli to podman Backup and Restore: The default container cli is set to docker and the default is podman. Change-Id: I7090d41c0d0083fd8feb248a35849c3dd8956540 --- tripleo_ansible/roles/backup-and-restore/defaults/main.yml | 2 +- .../roles/backup-and-restore/molecule/default/playbook.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tripleo_ansible/roles/backup-and-restore/defaults/main.yml b/tripleo_ansible/roles/backup-and-restore/defaults/main.yml index cd002758f..e894b5ad2 100644 --- a/tripleo_ansible/roles/backup-and-restore/defaults/main.yml +++ b/tripleo_ansible/roles/backup-and-restore/defaults/main.yml @@ -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 diff --git a/tripleo_ansible/roles/backup-and-restore/molecule/default/playbook.yml b/tripleo_ansible/roles/backup-and-restore/molecule/default/playbook.yml index dbf130c3a..a2262ac51 100644 --- a/tripleo_ansible/roles/backup-and-restore/molecule/default/playbook.yml +++ b/tripleo_ansible/roles/backup-and-restore/molecule/default/playbook.yml @@ -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"