starlingx/ansible-playbooks
Code Issues Proposed changes

Merge "Revert "Restore host filesystems with collected sizes""

Browse Source
This commit is contained in:
Zuul 2021-05-23 15:21:46 +00:00 committed by Gerrit Code Review
commit b5ec9fdc57
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
playbookconfig/src/playbooks/roles/bootstrap/apply-manifest/tasks/apply_bootstrap_manifest.yml
View File

@ -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
@ -270,25 +269,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: