Ruakij/Ansible-roles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix private_ip checking

Browse Source
This commit is contained in:
Ruakij 2022-10-17 22:47:10 +02:00
parent d2d8ebd8cc
commit 315f5a1805
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
netmaker_server/tasks/prerequisites.yml
View File

@ -7,4 +7,3 @@
- name: Check if default-ipv4-address is private - name: Check if default-ipv4-address is private
set_fact: set_fact:
private_ipv4_address: "{{ ansible_facts.default_ipv4.address | regex_search('^((10)|(192\\.168)|(172\\.((1[6-9])|(2[0-9])|(3[0-1])))|(100))\\.') }}" private_ipv4_address: "{{ ansible_facts.default_ipv4.address | regex_search('^((10)|(192\\.168)|(172\\.((1[6-9])|(2[0-9])|(3[0-1])))|(100))\\.') }}"
when: "netmaker.dynamicIp"

2
netmaker_server/templates/docker-compose.yml.template
View File

@ -63,7 +63,7 @@ services:
NODE_ID: "{{ ansible_facts.nodename }}" NODE_ID: "{{ ansible_facts.nodename }}"
MASTER_KEY: "{{ netmaker.master_key }}" # The admin master key for accessing the API. Change this in any production installation. MASTER_KEY: "{{ netmaker.master_key }}" # The admin master key for accessing the API. Change this in any production installation.
{% if not private_ipv4_address %} {% if not private_ipv4_address and not netmaker.dynamicIp %}
SERVER_HOST: "{{ ansible_facts.default_ipv4.address }}" # Set to public IP of machine. SERVER_HOST: "{{ ansible_facts.default_ipv4.address }}" # Set to public IP of machine.
{% endif %} {% endif %}
SERVER_NAME: "netmaker-broker.{{ netmaker.base_domain }}" # The domain/host IP indicating the mq broker address SERVER_NAME: "netmaker-broker.{{ netmaker.base_domain }}" # The domain/host IP indicating the mq broker address