From d7c73f1a970e405fbc49bd82c67d5f0e690e108c Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 26 Jul 2024 14:12:10 -0400 Subject: [PATCH] refactor --- bigboot_rear_backup.yml | 27 +++++---------------------- bigboot_rear_nfs_export.yml | 19 +++++++++++++++++++ bigboot_setup_environment.yml | 12 +++--------- tasks/rear_nfs_exports.yml | 9 +++++++++ 4 files changed, 36 insertions(+), 31 deletions(-) create mode 100644 bigboot_rear_nfs_export.yml create mode 100644 tasks/rear_nfs_exports.yml diff --git a/bigboot_rear_backup.yml b/bigboot_rear_backup.yml index c03a459..8b98be9 100644 --- a/bigboot_rear_backup.yml +++ b/bigboot_rear_backup.yml @@ -1,23 +1,6 @@ --- -- name: Perform logical volume and boot parition resizing as needed - hosts: all - become: true - gather_facts: true - strategy: free - - vars_files: - - bigboot_vars.yml - - tasks: - - name: ReaR backup per host - ansible.builtin.include_role: - name: rhc.rear.rear_backup - vars: - client_ips: "{{ item['value']['bigboot_size'] }}" - namehost: "{{ item['key'] }}" - loop: "{{ bigboot_data | dict2items }}" - loop_control: - label: "{{ item['key'] }}" - when: - - item['value']['bigboot_execute_bigboot'] | bool - - not bigboot_rear_backup_skip | default(false) | bool +- name: Perform a ReaR backup before the /boot expansion + ansible.builtin.import_playbook: rhc.rear.rear_backup + when: + - bigboot_data[inventory_hostname]['bigboot_execute_bigboot'] | default(false) | bool + - not bigboot_rear_backup_skip | default(false) | bool diff --git a/bigboot_rear_nfs_export.yml b/bigboot_rear_nfs_export.yml new file mode 100644 index 0000000..9ce1f77 --- /dev/null +++ b/bigboot_rear_nfs_export.yml @@ -0,0 +1,19 @@ +--- +- name: Perform logical volume and boot parition resizing as needed + hosts: rear-server + become: true + gather_facts: false + + vars_files: + - bigboot_vars.yml + + tasks: + - name: Create IP list and add to NFS exports + ansible.builtin.include_tasks: tasks/rear_nfs_exports.yml + loop: "{{ bigboot_data | dict2items }}" + loop_control: + label: "{{ item['key'] }}" + when: + - item['value']['bigboot_execute_bigboot'] | bool + - not bigboot_rear_backup_skip | default(false) | bool + diff --git a/bigboot_setup_environment.yml b/bigboot_setup_environment.yml index 16968cf..1bb86b6 100644 --- a/bigboot_setup_environment.yml +++ b/bigboot_setup_environment.yml @@ -40,7 +40,9 @@ 'bigboot_execute_shrink_lv': bigboot_execute_shrink_lv, 'bigboot_adjacent_lvm_device': bigboot_adjacent_lvm_device, 'bigboot_lv_shrink_size': bigboot_lv_shrink_size | int, - 'bigboot_size': bigboot_size + 'bigboot_size': bigboot_size, + 'ip_addresses': ansible_all_ipv4_addresses, + 'server_hostname': ansible_hostname } }) }}" @@ -52,12 +54,4 @@ - ansible_facts['services'][bigboot_docker_service] is defined - ansible_facts['services'][bigboot_docker_service]['state'] == "running" - -- name: Perform a ReaR backup if any disk modifications are to be made - ansible.builtin.import_playbook: rhc.rear.rear_backup - when: - - bigboot_execute_shrink_lv | default(false) | bool - or bigboot_execute_bigboot | default(false) | bool - - not rear_backup_skip | default(false) | bool - ... diff --git a/tasks/rear_nfs_exports.yml b/tasks/rear_nfs_exports.yml new file mode 100644 index 0000000..8c5403b --- /dev/null +++ b/tasks/rear_nfs_exports.yml @@ -0,0 +1,9 @@ +--- +- name: Create list of IP addresses and hostnames + ansible.builtin.set_fact: + client_ips: "{{ item['value']['ip_addresses'] }}" + namehost: "{{ item['value']['server_hostname'] }}" + +- name: Include NFS export role + ansible.builtin.include_role: + name: rhc.rear.say_hi