From 637be8b2b27977641e32377238bfcd2dab200e91 Mon Sep 17 00:00:00 2001 From: Michael Wilson Date: Thu, 20 Oct 2022 15:22:52 +0200 Subject: [PATCH] fixes --- linux/k3s/master/defaults/main.yml | 1 + linux/k3s/master/tasks/main.yml | 2 +- linux/k3s/node/tasks/main.yml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/linux/k3s/master/defaults/main.yml b/linux/k3s/master/defaults/main.yml index 19195ee..183e6ee 100644 --- a/linux/k3s/master/defaults/main.yml +++ b/linux/k3s/master/defaults/main.yml @@ -1,2 +1,3 @@ k3s_master_token: SOME_SECRET k3s_bootstrap: false +k3s_master_address: "{{ hostvars[groups['linux_k3s_master'][0]]['ipv4_address'] }}" diff --git a/linux/k3s/master/tasks/main.yml b/linux/k3s/master/tasks/main.yml index fe361ca..ac42862 100644 --- a/linux/k3s/master/tasks/main.yml +++ b/linux/k3s/master/tasks/main.yml @@ -1,4 +1,4 @@ - name: run cluster init on first node - shell: "curl -sfL https://get.k3s.io | K3S_TOKEN={{ k3s_secret }} sh -s - server --cluster-init" + shell: "curl -sfL https://get.k3s.io | K3S_TOKEN={{ k3s_master_secret }} sh -s - server --cluster-init" become: yes when: k3s_bootstrap diff --git a/linux/k3s/node/tasks/main.yml b/linux/k3s/node/tasks/main.yml index a241afc..d444423 100644 --- a/linux/k3s/node/tasks/main.yml +++ b/linux/k3s/node/tasks/main.yml @@ -1,4 +1,4 @@ - name: join node to cluster - shell: "curl -sfL https://get.k3s.io | K3S_TOKEN={{ k3s_token }} sh -s - server --server https://{{ k3s_master_address }}>:6443" + shell: "curl -sfL https://get.k3s.io | K3S_TOKEN={{ k3s_node_token }} sh -s - server --server https://{{ k3s_master_address }}>:6443" become: yes when: k3s_bootstrap