change docker bip to gateway

This commit is contained in:
m0duspwnens
2023-07-24 13:38:14 -04:00
parent 9bda01bd29
commit 00483018ca
5 changed files with 6 additions and 6 deletions

View File

@@ -1,6 +1,6 @@
docker: docker:
range: '172.17.1.0/24' range: '172.17.1.0/24'
bip: '172.17.1.1' gateway: '172.17.1.1'
containers: containers:
'so-dockerregistry': 'so-dockerregistry':
final_octet: 20 final_octet: 20

View File

@@ -103,7 +103,7 @@ sos_docker_net:
docker_network.present: docker_network.present:
- name: sobridge - name: sobridge
- subnet: {{ DOCKER.range }} - subnet: {{ DOCKER.range }}
- gateway: {{ DOCKER.bip.split("/")[0] }} - gateway: {{ DOCKER.gateway }}
- options: - options:
com.docker.network.bridge.name: 'sobridge' com.docker.network.bridge.name: 'sobridge'
com.docker.network.driver.mtu: '1500' com.docker.network.driver.mtu: '1500'

View File

@@ -1,6 +1,6 @@
docker: docker:
bip: gateway:
description: Bind IP for the default docker interface. description: Gateway for the default docker interface.
helpLink: docker.html helpLink: docker.html
advanced: True advanced: True
range: range:

View File

@@ -43,7 +43,7 @@ so-mysql:
- {{ BINDING }} - {{ BINDING }}
{% endfor %} {% endfor %}
- environment: - environment:
- MYSQL_ROOT_HOST={{ GLOBALS.so_docker_bip }} - MYSQL_ROOT_HOST={{ GLOBALS.so_docker_gateway }}
- MYSQL_ROOT_PASSWORD=/etc/mypass - MYSQL_ROOT_PASSWORD=/etc/mypass
{% if DOCKER.containers['so-mysql'].extra_env %} {% if DOCKER.containers['so-mysql'].extra_env %}
{% for XTRAENV in DOCKER.containers['so-mysql'].extra_env %} {% for XTRAENV in DOCKER.containers['so-mysql'].extra_env %}

View File

@@ -22,7 +22,7 @@
'md_engine': INIT.PILLAR.global.mdengine, 'md_engine': INIT.PILLAR.global.mdengine,
'pipeline': INIT.PILLAR.global.pipeline, 'pipeline': INIT.PILLAR.global.pipeline,
'so_version': INIT.PILLAR.global.soversion, 'so_version': INIT.PILLAR.global.soversion,
'so_docker_bip': DOCKER.bip, 'so_docker_gateway': DOCKER.gateway,
'so_docker_range': DOCKER.range, 'so_docker_range': DOCKER.range,
'url_base': INIT.PILLAR.global.url_base, 'url_base': INIT.PILLAR.global.url_base,
'so_model': INIT.GRAINS.get('sosmodel',''), 'so_model': INIT.GRAINS.get('sosmodel',''),