diff --git a/tripleo_ansible/roles/backup_and_restore/defaults/main.yml b/tripleo_ansible/roles/backup_and_restore/defaults/main.yml index ac209ced5..b7c9164f1 100644 --- a/tripleo_ansible/roles/backup_and_restore/defaults/main.yml +++ b/tripleo_ansible/roles/backup_and_restore/defaults/main.yml @@ -75,3 +75,6 @@ tripleo_backup_and_restore_firewalld_zone: "libvirt" # The ReaR rpm installs a cronjob at 1:30 each day by default. This variable deactivate that behaviour. tripleo_backup_and_restore_remove_default_cronjob: true + +# Skip the ping test to the NFS server on rear setup +tripleo_backup_and_restore_skip_nfs_test: false diff --git a/tripleo_ansible/roles/backup_and_restore/molecule/default/converge.yml b/tripleo_ansible/roles/backup_and_restore/molecule/default/converge.yml index 58a7a882b..dab3abcaa 100644 --- a/tripleo_ansible/roles/backup_and_restore/molecule/default/converge.yml +++ b/tripleo_ansible/roles/backup_and_restore/molecule/default/converge.yml @@ -20,7 +20,7 @@ hosts: all roles: - role: backup_and_restore - tripleo_backup_and_restore_nfs_server: undercloud + tripleo_backup_and_restore_nfs_server: localhost 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" diff --git a/tripleo_ansible/roles/backup_and_restore/molecule/default/prepare.yml b/tripleo_ansible/roles/backup_and_restore/molecule/default/prepare.yml index af50ba650..378559a1b 100644 --- a/tripleo_ansible/roles/backup_and_restore/molecule/default/prepare.yml +++ b/tripleo_ansible/roles/backup_and_restore/molecule/default/prepare.yml @@ -83,13 +83,13 @@ podman_image: name: "{{ item }}" with_items: - - centos:8 + - registry.access.redhat.com/ubi8/ubi-minimal - mysql - name: Create a data container podman_container: name: "{{ item }}" - image: centos:8 + image: ubi-minimal state: started command: sleep 1d with_items: diff --git a/tripleo_ansible/roles/backup_and_restore/tasks/setup_rear.yml b/tripleo_ansible/roles/backup_and_restore/tasks/setup_rear.yml index 0b7b7a5d4..7129fe488 100644 --- a/tripleo_ansible/roles/backup_and_restore/tasks/setup_rear.yml +++ b/tripleo_ansible/roles/backup_and_restore/tasks/setup_rear.yml @@ -86,6 +86,12 @@ tags: - bar_setup_rear +- name: Check NFS server IP + command: ping -c 1 '{{ tripleo_backup_and_restore_nfs_server }}' + when: not (tripleo_backup_and_restore_skip_nfs_test | bool) + tags: + - bar_setup_rear + - name: Generate ReaR config file become: true template: