From 8bfee72c8c538d2c5f53cf07eef0e8dcf725901b Mon Sep 17 00:00:00 2001
From: Juan Badia Payno <jbadiapa@redhat.com>
Date: Tue, 4 May 2021 18:06:44 +0200
Subject: [PATCH] BnR Test NFS server conectivity & ubi-minimal container image

When ReaR is configure there is no validation on the NFS server,
this patch adds a simple ping test validation to the NFS server.
The NFS ping test can be disabled with a variable.

This patch also switches from centos-8 to ubi-minimal container.

Change-Id: Ibbf7ba3435da8dc9218403df76f0eb86df4374db
(cherry picked from commit 64932f1bcad982d1e85179149da9f3803b22ea8d)
---
 tripleo_ansible/roles/backup_and_restore/defaults/main.yml  | 3 +++
 .../roles/backup_and_restore/molecule/default/converge.yml  | 2 +-
 .../roles/backup_and_restore/molecule/default/prepare.yml   | 4 ++--
 .../roles/backup_and_restore/tasks/setup_rear.yml           | 6 ++++++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/tripleo_ansible/roles/backup_and_restore/defaults/main.yml b/tripleo_ansible/roles/backup_and_restore/defaults/main.yml
index 5b61223fd..4dd61f786 100644
--- a/tripleo_ansible/roles/backup_and_restore/defaults/main.yml
+++ b/tripleo_ansible/roles/backup_and_restore/defaults/main.yml
@@ -79,3 +79,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 92db74f8e..41bf73419 100644
--- a/tripleo_ansible/roles/backup_and_restore/molecule/default/converge.yml
+++ b/tripleo_ansible/roles/backup_and_restore/molecule/default/converge.yml
@@ -20,6 +20,6 @@
   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_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 69d868f94..49c5fe5e2 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: