Browse Source

Merge "BnR Test NFS server conectivity & ubi-minimal container image" into stable/wallaby

changes/33/793433/2
Zuul 2 weeks ago
committed by Gerrit Code Review
parent
commit
7062ca0f8e
4 changed files with 12 additions and 3 deletions
  1. +3
    -0
      tripleo_ansible/roles/backup_and_restore/defaults/main.yml
  2. +1
    -1
      tripleo_ansible/roles/backup_and_restore/molecule/default/converge.yml
  3. +2
    -2
      tripleo_ansible/roles/backup_and_restore/molecule/default/prepare.yml
  4. +6
    -0
      tripleo_ansible/roles/backup_and_restore/tasks/setup_rear.yml

+ 3
- 0
tripleo_ansible/roles/backup_and_restore/defaults/main.yml View File

@ -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

+ 1
- 1
tripleo_ansible/roles/backup_and_restore/molecule/default/converge.yml View File

@ -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"

+ 2
- 2
tripleo_ansible/roles/backup_and_restore/molecule/default/prepare.yml View File

@ -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:


+ 6
- 0
tripleo_ansible/roles/backup_and_restore/tasks/setup_rear.yml View File

@ -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:


Loading…
Cancel
Save