From c0ec5ca930afedeb922b789c7f60b91bb3384570 Mon Sep 17 00:00:00 2001 From: Anes Belfodil Date: Sun, 8 Aug 2021 18:14:15 -0400 Subject: [PATCH 1/2] Add advertised_address --- tasks/build/preconfigure-k3s.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tasks/build/preconfigure-k3s.yml b/tasks/build/preconfigure-k3s.yml index ec25125..77ab842 100644 --- a/tasks/build/preconfigure-k3s.yml +++ b/tasks/build/preconfigure-k3s.yml @@ -102,6 +102,24 @@ check_mode: false when: k3s_control_node_address is defined + - name: Ensure the node registration address is defined from server node ip + ansible.builtin.set_fact: + k3s_registration_address: "{{ hostvars[k3s_control_delegate].k3s_server['node-ip'] }}" + check_mode: false + when: + - k3s_registration_address is not defined + - k3s_control_node_address is not defined + - hostvars[k3s_control_delegate].k3s_server['node-ip'] is defined + + - name: Ensure the node registration address is defined from agent node ip + ansible.builtin.set_fact: + k3s_registration_address: "{{ hostvars[k3s_control_delegate].k3s_agent['node-ip'] }}" + check_mode: false + when: + - k3s_registration_address is not defined + - k3s_control_node_address is not defined + - hostvars[k3s_control_delegate].k3s_agent['node-ip'] is defined + - name: Ensure the node registration address is defined ansible.builtin.set_fact: k3s_registration_address: "{{ hostvars[k3s_control_delegate].ansible_host | default(hostvars[k3s_control_delegate].ansible_fqdn) }}" From f198b45d58cbecbd843023d709b0c3599df022cc Mon Sep 17 00:00:00 2001 From: Xan Manning Date: Sat, 14 Aug 2021 14:04:56 +0100 Subject: [PATCH 2/2] used combined configuration from vars.yaml, removed duplicated task for control plane --- tasks/build/preconfigure-k3s.yml | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/tasks/build/preconfigure-k3s.yml b/tasks/build/preconfigure-k3s.yml index 77ab842..4c73d7d 100644 --- a/tasks/build/preconfigure-k3s.yml +++ b/tasks/build/preconfigure-k3s.yml @@ -102,23 +102,14 @@ check_mode: false when: k3s_control_node_address is defined - - name: Ensure the node registration address is defined from server node ip + - name: Ensure the node registration address is defined from node-ip ansible.builtin.set_fact: - k3s_registration_address: "{{ hostvars[k3s_control_delegate].k3s_server['node-ip'] }}" + k3s_registration_address: "{{ hostvars[k3s_control_delegate].k3s_runtime_config['node-ip'] }}" check_mode: false when: - k3s_registration_address is not defined - k3s_control_node_address is not defined - - hostvars[k3s_control_delegate].k3s_server['node-ip'] is defined - - - name: Ensure the node registration address is defined from agent node ip - ansible.builtin.set_fact: - k3s_registration_address: "{{ hostvars[k3s_control_delegate].k3s_agent['node-ip'] }}" - check_mode: false - when: - - k3s_registration_address is not defined - - k3s_control_node_address is not defined - - hostvars[k3s_control_delegate].k3s_agent['node-ip'] is defined + - hostvars[k3s_control_delegate].k3s_runtime_config['node-ip'] is defined - name: Ensure the node registration address is defined ansible.builtin.set_fact: @@ -131,13 +122,6 @@ when: k3s_registration_address is not defined or k3s_control_delegate is not defined -- name: Ensure k3s_runtime_config is set for control plane - ansible.builtin.set_fact: - k3s_runtime_config: "{{ (k3s_server | default({})) | combine((k3s_agent | default({}))) }}" - when: - - (k3s_server is defined or k3s_agent is defined) - - (k3s_control_node is defined and k3s_control_node) - - name: Ensure k3s_runtime_config is set for agents ansible.builtin.set_fact: k3s_runtime_config: "{{ (k3s_agent | default({})) }}"