beenull/JG-mirror
1
0
Fork 0
mirror of https://github.com/JamesTurland/JimsGarage.git synced 2024-11-21 15:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: beenull:52a44a2b01413f622a305f999bb03bb5921006a0
Branches Tags
beenull:main
...
compare: beenull:b2588bdff650b458637eb2e0dbef674e0a366af9
Branches Tags
beenull:main

2 commits
52a44a2b01 ... b2588bdff6

Author SHA1 Message Date
Ikariusrb
b2588bdff6
Merge d9c0abb396 into 9b130ebc96 2024-11-11 15:04:56 -08:00
Ross Becker
d9c0abb396 Make host references generic (no more server1), and iterate servers in templates, rather than hardcoding them 2024-07-06 13:23:53 -07:00
4 changed files with 13 additions and 13 deletions
Show stats Expand all files Collapse all files

4
Ansible/Playbooks/RKE2/roles/add-agent/templates/rke2-agent-config.j2
View file

@ -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
Ansible/Playbooks/RKE2/roles/add-server/templates/rke2-server-config.j2
View file

@ -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
Ansible/Playbooks/RKE2/roles/rke2-prepare/tasks/main.yaml
View file

@ -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
@ -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
Ansible/Playbooks/RKE2/roles/rke2-prepare/templates/rke2-server-config.j2
View file

@ -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: