Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make host references generic (no more server1), and iterate servers in templates, rather than hardcoding them #94

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make host references generic (no more server1), and iterate servers in templates, rather than hardcoding them #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Ansible/Playbooks/RKE2/roles/add-agent/templates/rke2-agent-config.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
write-kubeconfig-mode: "0644"
token: {{ hostvars['server1']['token'] }}
server: https://{{ hostvars['server1']['ansible_host'] }}:9345
token: {{ hostvars[groups['servers'][0]]['token'] }}
server: https://{{ hostvars[groups['servers'][0]]['ansible_host'] }}:9345
node-label:
- "agent=true"
10 changes: 5 additions & 5 deletions Ansible/Playbooks/RKE2/roles/add-server/templates/rke2-server-config.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
write-kubeconfig-mode: "0644"
token: {{ hostvars['server1']['token'] }}
server: https://{{ hostvars['server1']['ansible_host'] }}:9345
token: {{ hostvars[groups['servers'][0]]['token'] }}
server: https://{{ hostvars[groups['servers'][0]]['ansible_host'] }}:9345
tls-san:
- {{ vip }}
- {{ hostvars['server1']['ansible_host'] }}
- {{ hostvars['server2']['ansible_host'] }}
- {{ hostvars['server3']['ansible_host'] }}
{% for host in groups['servers'] %}
- {{ hostvars[host]['ansible_host'] }}
{% endfor %}
node-label:
- server=true
6 changes: 3 additions & 3 deletions Ansible/Playbooks/RKE2/roles/rke2-prepare/tasks/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
daemon_reload: true
when: inventory_hostname in groups['servers'][0]

# wait for node token to be availale so that we can copy it, we need this to join other nodes
# wait for node token to be available so that we can copy it, we need this to join other nodes
- name: Wait for node-token
ansible.builtin.wait_for:
path: /var/lib/rancher/rke2/server/node-token
Expand Down Expand Up @@ -126,9 +126,9 @@
when: inventory_hostname == groups['servers'][0]

# change IP from local to server 1 IP
- name: Replace IP address with server1
- name: Replace IP address with first server
ansible.builtin.replace:
path: /home/{{ ansible_user }}/.kube/config
regexp: '127.0.0.1'
replace: "{{ hostvars['server1']['ansible_host'] }}"
replace: "{{ hostvars[groups['servers'][0]]['ansible_host'] }}"
when: inventory_hostname == groups['servers'][0]
6 changes: 3 additions & 3 deletions Ansible/Playbooks/RKE2/roles/rke2-prepare/templates/rke2-server-config.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
write-kubeconfig-mode: "0644"
tls-san:
- {{ vip }}
- {{ hostvars['server1']['ansible_host'] }}
- {{ hostvars['server2']['ansible_host'] }}
- {{ hostvars['server3']['ansible_host'] }}
{% for host in groups['servers'] %}
- {{ hostvars[host]['ansible_host'] }}
{% endfor %}
node-label:
- server=true
disable:
Expand Down