From 4e96b762f549aadb0291cc9bcf3352ae923e94eb Mon Sep 17 00:00:00 2001 From: Mihnea Saracin Date: Sat, 22 May 2021 15:48:19 +0000 Subject: [PATCH] Revert "Restore host filesystems with collected sizes" This reverts commit 255488739efa4ac072424b19f2dbb7a3adb0254e. Reason for revert: Did a rework to fix https://bugs.launchpad.net/starlingx/+bug/1926591. The original problem was in puppet, and this fix in ansible was not good enough, it generated some other problems. Change-Id: Iea79701a874effecb7fe995ac468d50081d1a84f Depends-On: I55ae6954d24ba32e40c2e5e276ec17015d9bba44 --- .../tasks/apply_bootstrap_manifest.yml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/playbookconfig/src/playbooks/roles/bootstrap/apply-manifest/tasks/apply_bootstrap_manifest.yml b/playbookconfig/src/playbooks/roles/bootstrap/apply-manifest/tasks/apply_bootstrap_manifest.yml index ebcd584f9..47db9d954 100644 --- a/playbookconfig/src/playbooks/roles/bootstrap/apply-manifest/tasks/apply_bootstrap_manifest.yml +++ b/playbookconfig/src/playbooks/roles/bootstrap/apply-manifest/tasks/apply_bootstrap_manifest.yml @@ -55,7 +55,6 @@ tar -C {{ hieradata_workdir }} -xpf {{ restore_data_file }} --transform='s,.*/,,' '{{ archive_puppet_permdir }}/*static.yaml' '{{ archive_puppet_permdir }}/system.yaml' - '{{ archive_puppet_permdir }}/{{ derived_network_params.controller_0_address }}.yaml' args: warn: false @@ -253,25 +252,11 @@ command: "grep 'platform::drbd::.*::params::lv_size.*' {{ hieradata_workdir }}/system.yaml" register: system_file - - name: Read host filesystems settings from controller-0 hieradata - command: "grep 'platform::filesystem::.*::params::lv_size.*' - {{ hieradata_workdir }}/{{ derived_network_params.controller_0_address }}.yaml" - register: host_file - - # Replace platform::filesystem::docker::params::lv_size with - # platform::filesystem::docker::params::bootstrap::lv_size - # to have similar behaviour with the bootstrap steps - - name: Set host_file_list - set_fact: - host_file_list: "{{ host_file.stdout_lines | - map('regex_replace', '^platform::filesystem::docker::params::lv_size', - 'platform::filesystem::docker::params::bootstrap::lv_size') | list }}" - - name: Write filesystem settings to runtime hieradata lineinfile: path: "{{ hieradata_workdir }}/runtime.yaml" line: "{{ item }}" - with_items: "{{ system_file.stdout_lines + host_file_list }}" + with_items: "{{system_file.stdout_lines}}" - name: Remove system hieradata file: