starlingx/ansible-playbooks
Code Issues Proposed changes

Merge "Fix for erroneously executing tasks while bootstrap replay"

Browse Source
This commit is contained in:
Zuul 2024-08-02 20:16:44 +00:00 committed by Gerrit Code Review
commit 364898a00a
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
playbookconfig/src/playbooks/roles/bootstrap/bringup-bootstrap-applications/templates/last_bootstrap_config.j2
View File

@ -37,10 +37,9 @@ prev_management_multicast_end_address: {{ management_multicast_end_address }}
prev_external_oam_node_0_address: {{ external_oam_node_0_address }}
prev_external_oam_node_1_address: {{ external_oam_node_1_address }}
prev_apiserver_cert_sans: {{ apiserver_cert_sans | to_yaml }}
prev_k8s_root_ca_cert: {{ k8s_root_ca_cert }}
prev_k8s_root_ca_key: {{ k8s_root_ca_key }}
prev_k8s_root_ca_cert: {{ k8s_root_ca_cert | default("''", true) }}
prev_k8s_root_ca_key: {{ k8s_root_ca_key | default("''", true) }}
prev_apiserver_oidc: {{ apiserver_oidc | to_yaml }}
prev_etcd_root_ca_cert: {{ etcd_root_ca_cert }}
prev_etcd_root_ca_key: {{ etcd_root_ca_key }}
prev_docker_registries:
{{ docker_registries | to_yaml }}
prev_etcd_root_ca_cert: {{ etcd_root_ca_cert | default("''", true) }}
prev_etcd_root_ca_key: {{ etcd_root_ca_key | default("''", true) }}
prev_docker_registries: {{ docker_registries }}

14
playbookconfig/src/playbooks/roles/bootstrap/prepare-env/tasks/main.yml
View File

@ -617,6 +617,20 @@
- name: If replayed, don't change K8S and ETCD CA filepaths if content doesn't change
include_tasks: verify_k8s_etcd_certs_changed.yml
- name: Remove 'password' keys from prev_docker_registries before comparing with docker_registries
set_fact:
prev_docker_registries: >-
{{
prev_docker_registries
| combine({item.key: item.value
| combine({
'password': omit
})
},
recursive=True)
}}
with_dict: "{{ prev_docker_registries }}"
- name: Turn on docker reconfiguration flag if docker config is changed
set_fact:
docker_config_update: true