From 3c5b071c25deb46ef5ec57c0937af557b4549bb3 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 27 May 2023 14:07:13 -0400 Subject: [PATCH 1/3] Estimate IIAB software disk usage, in /etc/iiab/iiab.ini 'summary' section --- roles/0-init/tasks/create_iiab_ini.yml | 19 +++++++++++++------ roles/9-local-addons/tasks/main.yml | 15 +++++++++++++++ 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/roles/0-init/tasks/create_iiab_ini.yml b/roles/0-init/tasks/create_iiab_ini.yml index 980a7fc1b..002e09225 100644 --- a/roles/0-init/tasks/create_iiab_ini.yml +++ b/roles/0-init/tasks/create_iiab_ini.yml @@ -1,7 +1,11 @@ -# workaround for fact that auto create does not work on iiab_ini_file (/etc/iiab/iiab.ini) +- name: Record disk_space_a_priori (permanently, into {{ iiab_ini_file }}) to later estimate iiab_software_disk_usage + shell: df -PB1 $(findmnt / -o SOURCE -n) | awk 'NR==2 {print $4}' + register: df1 + +# workaround for fact that auto create does not work on iiab_ini_file - name: Create {{ iiab_ini_file }} file: - path: "{{ iiab_ini_file }}" + path: "{{ iiab_ini_file }}" # /etc/iiab/iiab.ini state: touch - name: Run command 'dpkg --print-architecture' to identify OS architecture (CPU arch as revealed by ansible_architecture ~= ansible_machine is NOT enough!) @@ -12,10 +16,11 @@ command: dpkg --print-foreign-architectures register: dpkg_foreign_arch -- name: Add 'location' variable values to {{ iiab_ini_file }} + +- name: Add 'summary' variable values to {{ iiab_ini_file }} ini_file: path: "{{ iiab_ini_file }}" - section: initial-location + section: summary option: "{{ item.option }}" value: "{{ item.value | string }}" with_items: @@ -23,11 +28,13 @@ value: "{{ iiab_base }}" - option: iiab_dir value: "{{ iiab_dir }}" + - option: disk_space_a_priori + value: "{{ df1.stdout }}" -- name: Add 'version' variable values to {{ iiab_ini_file }} +- name: Add 'initial-versions' variable values to {{ iiab_ini_file }} ini_file: path: "{{ iiab_ini_file }}" - section: initial-version + section: initial-versions option: "{{ item.option }}" value: "{{ item.value | string }}" with_items: diff --git a/roles/9-local-addons/tasks/main.yml b/roles/9-local-addons/tasks/main.yml index f9ea8e20f..7070973c6 100644 --- a/roles/9-local-addons/tasks/main.yml +++ b/roles/9-local-addons/tasks/main.yml @@ -42,6 +42,21 @@ name: pbx when: pbx_install +- name: Read 'disk_space_a_priori' from /etc/iiab/iiab.ini + set_fact: + df1: "{{ lookup('ansible.builtin.ini', 'disk_space_a_priori', section='summary', file=iiab_ini_file) }}" + +- name: Record currently available disk space, to compare with original 'disk_space_a_priori' + shell: df -PB1 $(findmnt / -o SOURCE -n) | awk 'NR==2 {print $4}' + register: df2 + +- name: Add ESTIMATED 'iiab_software_disk_usage = {{ df1|int - df2.stdout|int }}' to {{ iiab_ini_file }} + ini_file: + path: "{{ iiab_ini_file }}" # /etc/iiab/iiab.ini + section: summary + option: iiab_software_disk_usage + value: "{{ df1|int - df2.stdout|int }}" + - name: Recording STAGE 9 HAS COMPLETED ==================== lineinfile: path: "{{ iiab_env_file }}" From 7205219292258593234a9a6a22fa7f7096d89017 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 27 May 2023 15:24:13 -0400 Subject: [PATCH 2/3] create_iiab_ini.yml: Rename iiab.ini section to 'initial' --- roles/0-init/tasks/create_iiab_ini.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/0-init/tasks/create_iiab_ini.yml b/roles/0-init/tasks/create_iiab_ini.yml index 002e09225..98c195b67 100644 --- a/roles/0-init/tasks/create_iiab_ini.yml +++ b/roles/0-init/tasks/create_iiab_ini.yml @@ -31,10 +31,10 @@ - option: disk_space_a_priori value: "{{ df1.stdout }}" -- name: Add 'initial-versions' variable values to {{ iiab_ini_file }} +- name: Add 'initial' variable values to {{ iiab_ini_file }} ini_file: path: "{{ iiab_ini_file }}" - section: initial-versions + section: initial option: "{{ item.option }}" value: "{{ item.value | string }}" with_items: From e06f833c6b1bebfc07e9ac607562c5011a3c7c79 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 27 May 2023 15:47:51 -0400 Subject: [PATCH 3/3] Explain saving disk_space_a_priori to iiab.ini --- roles/0-init/tasks/create_iiab_ini.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/0-init/tasks/create_iiab_ini.yml b/roles/0-init/tasks/create_iiab_ini.yml index 98c195b67..6e3e08a73 100644 --- a/roles/0-init/tasks/create_iiab_ini.yml +++ b/roles/0-init/tasks/create_iiab_ini.yml @@ -1,4 +1,4 @@ -- name: Record disk_space_a_priori (permanently, into {{ iiab_ini_file }}) to later estimate iiab_software_disk_usage +- name: Record disk_space_a_priori (permanently, into {{ iiab_ini_file }} below) to later estimate iiab_software_disk_usage shell: df -PB1 $(findmnt / -o SOURCE -n) | awk 'NR==2 {print $4}' register: df1