Merge "bnr change the name of the var to more generic names"

tripleo_ansible/roles/backup_and_restore/defaults/main.yml

@@ -39,12 +39,12 @@ tripleo_backup_and_restore_mysql_grants_file: "openstack-backup-mysql-grants.sql
 
 # All variables within this role should have a prefix of "tripleo_backup_and_restore"
 # By default this should be the Undercloud node
-tripleo_backup_and_restore_nfs_server: 192.168.24.1
-tripleo_backup_and_restore_nfs_storage_folder: /ctl_plane_backups
-tripleo_backup_and_restore_nfs_clients_nets: ['192.168.24.0/24', '10.0.0.0/24', '172.16.0.0/24']
+tripleo_backup_and_restore_server: 192.168.24.1
+tripleo_backup_and_restore_shared_storage_folder: /ctl_plane_backups
+tripleo_backup_and_restore_clients_nets: ['192.168.24.0/24', '10.0.0.0/24', '172.16.0.0/24']
 tripleo_backup_and_restore_rear_simulate: false
 tripleo_backup_and_restore_using_uefi_bootloader: 0
-tripleo_backup_and_restore_exclude_paths_common: ['/data/*', '/tmp/*', '{{ tripleo_backup_and_restore_nfs_storage_folder }}/*']
+tripleo_backup_and_restore_exclude_paths_common: ['/data/*', '/tmp/*', '{{ tripleo_backup_and_restore_shared_storage_folder }}/*']
 tripleo_backup_and_restore_exclude_paths_controller_non_bootstrapnode: false
 tripleo_backup_and_restore_exclude_paths_controller: ['/var/lib/mysql/*']
 tripleo_backup_and_restore_exclude_paths_compute: ['/var/lib/nova/instances/*']
@@ -68,8 +68,8 @@ tripleo_backup_and_restore_local_config:
 # double quoted as it will be interpreted by BASH.
 tripleo_backup_and_restore_rescue_config: {}
 
-tripleo_backup_and_restore_output_url: "nfs://{{ tripleo_backup_and_restore_nfs_server }}/ctl_plane_backups"
-tripleo_backup_and_restore_backup_url: "nfs://{{ tripleo_backup_and_restore_nfs_server }}/ctl_plane_backups"
+tripleo_backup_and_restore_output_url: "nfs://{{ tripleo_backup_and_restore_server }}/ctl_plane_backups"
+tripleo_backup_and_restore_backup_url: "nfs://{{ tripleo_backup_and_restore_server }}/ctl_plane_backups"
 
 # Ceph authentication backup file
 tripleo_backup_and_restore_ceph_auth_file: "ceph_auth_export.bak"
@@ -86,8 +86,8 @@ 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
+# Skip the ping test to the server on rear setup
+tripleo_backup_and_restore_skip_server_test: false
 
 # How many seconds do we want to wait fir pcs cluster stop to finish
 tripleo_backup_and_restore_pcs_timeout: 3600

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: localhost
+      tripleo_backup_and_restore_server: localhost
       tripleo_backup_and_restore_rear_simulate: true
       tripleo_backup_and_restore_hiera_config_file: "{{ ansible_user_dir }}/hiera.yaml"

tripleo_ansible/roles/backup_and_restore/tasks/ceph_backup.yml

@@ -57,7 +57,7 @@
 - name: Mount nfs shared directory
   mount:
     path: "{{ tripleo_backup_and_restore_temporary_dir.path }}"
-    src: "{{ tripleo_backup_and_restore_nfs_server }}:{{ tripleo_backup_and_restore_nfs_storage_folder }}"
+    src: "{{ tripleo_backup_and_restore_server }}:{{ tripleo_backup_and_restore_shared_storage_folder }}"
     fstype: nfs
     opts: rw,noatime
     state: mounted
@@ -82,7 +82,7 @@
 - name: Delete the mount point from /etc/fstab
   mount:
     path: "{{ tripleo_backup_and_restore_temporary_dir.path }}"
-    src: "{{ tripleo_backup_and_restore_nfs_server }}:{{ tripleo_backup_and_restore_nfs_storage_folder }}"
+    src: "{{ tripleo_backup_and_restore_server }}:{{ tripleo_backup_and_restore_shared_storage_folder }}"
     fstype: nfs
     opts: rw,noatime
     state: absent

tripleo_ansible/roles/backup_and_restore/tasks/setup_nfs.yml

@@ -105,7 +105,7 @@
 
 - name: Create backup folder in the NFS server
   file:
-    path: "{{ tripleo_backup_and_restore_nfs_storage_folder }}"
+    path: "{{ tripleo_backup_and_restore_shared_storage_folder }}"
     state: directory
     mode: '0777'
   tags:
@@ -113,8 +113,8 @@
 
 - name: Get the lines
   set_fact:
-    bar_exportfs_lines: "{% for net in tripleo_backup_and_restore_nfs_clients_nets %}\
-      {{ tripleo_backup_and_restore_nfs_storage_folder }} {{ net }}(rw,sync,no_root_squash,no_subtree_check)\n{% endfor %}"
+    bar_exportfs_lines: "{% for net in tripleo_backup_and_restore_clients_nets %}\
+      {{ tripleo_backup_and_restore_shared_storage_folder }} {{ net }}(rw,sync,no_root_squash,no_subtree_check)\n{% endfor %}"
   tags:
     - bar_setup_nfs_server
 

tripleo_ansible/roles/backup_and_restore/tasks/setup_rear.yml

@@ -82,9 +82,9 @@
   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)
+- name: Check backup server IP
+  command: ping -c 1 '{{ tripleo_backup_and_restore_server }}'
+  when: not (tripleo_backup_and_restore_skip_server_test | bool)
   tags:
     - bar_setup_rear