Merge branch 'lablabs:main' into main

lablabs · May 2, 2023 · 6b12967 · 6b12967
2 parents 4b9cfaa + 1eaecab
commit 6b12967
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -18,13 +18,16 @@ rke2_ha_mode_kubevip: false
 # Or if the keepalived is disabled, use IP address of your LB.
 rke2_api_ip: "{{ hostvars[groups[rke2_servers_group_name].0]['ansible_default_ipv4']['address'] }}"
 
+# optional option for RKE2 Server to listen on a private IP address on port 9345
+# rke2_api_private_ip:
+
 # optional option for kubevip IP subnet
 # rke2_api_cidr: 24
 
 # optional option for kubevip
 # rke2_interface: eth0
 
-# optiononal option for kubevip load balancer IP range
+# optional option for kubevip load balancer IP range
 # rke2_loadbalancer_ip_range: 192.168.1.50-192.168.1.100
 
 # Install kubevip cloud provider if rke2_ha_mode_kubevip is true

diff --git a/templates/config.yaml.j2 b/templates/config.yaml.j2
@@ -1,7 +1,11 @@
 
 {% if active_server is defined %}
+{% if rke2_api_private_ip is defined %}
+server: https://{{ rke2_api_private_ip }}:9345
+{% else %}
 server: https://{{ rke2_api_ip }}:9345
 {% endif %}
+{% endif %}
 {% if rke2_agent_token is defined %}
 agent-token: {{ rke2_agent_token }}
 {% endif %}