From 00483018ca2a666b248f0d533a927aa58658bda0 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 24 Jul 2023 13:38:14 -0400 Subject: [PATCH] change docker bip to gateway --- salt/docker/defaults.yaml | 2 +- salt/docker/init.sls | 2 +- salt/docker/soc_docker.yaml | 4 ++-- salt/mysql/enabled.sls | 2 +- salt/vars/globals.map.jinja | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/salt/docker/defaults.yaml b/salt/docker/defaults.yaml index dcdc9e497..e39feaf06 100644 --- a/salt/docker/defaults.yaml +++ b/salt/docker/defaults.yaml @@ -1,6 +1,6 @@ docker: range: '172.17.1.0/24' - bip: '172.17.1.1' + gateway: '172.17.1.1' containers: 'so-dockerregistry': final_octet: 20 diff --git a/salt/docker/init.sls b/salt/docker/init.sls index 61801d3a3..45ba4a1ac 100644 --- a/salt/docker/init.sls +++ b/salt/docker/init.sls @@ -103,7 +103,7 @@ sos_docker_net: docker_network.present: - name: sobridge - subnet: {{ DOCKER.range }} - - gateway: {{ DOCKER.bip.split("/")[0] }} + - gateway: {{ DOCKER.gateway }} - options: com.docker.network.bridge.name: 'sobridge' com.docker.network.driver.mtu: '1500' diff --git a/salt/docker/soc_docker.yaml b/salt/docker/soc_docker.yaml index 73e8063d9..82f59e4dc 100644 --- a/salt/docker/soc_docker.yaml +++ b/salt/docker/soc_docker.yaml @@ -1,6 +1,6 @@ docker: - bip: - description: Bind IP for the default docker interface. + gateway: + description: Gateway for the default docker interface. helpLink: docker.html advanced: True range: diff --git a/salt/mysql/enabled.sls b/salt/mysql/enabled.sls index c23d9bcad..1e1a3ca1e 100644 --- a/salt/mysql/enabled.sls +++ b/salt/mysql/enabled.sls @@ -43,7 +43,7 @@ so-mysql: - {{ BINDING }} {% endfor %} - environment: - - MYSQL_ROOT_HOST={{ GLOBALS.so_docker_bip }} + - MYSQL_ROOT_HOST={{ GLOBALS.so_docker_gateway }} - MYSQL_ROOT_PASSWORD=/etc/mypass {% if DOCKER.containers['so-mysql'].extra_env %} {% for XTRAENV in DOCKER.containers['so-mysql'].extra_env %} diff --git a/salt/vars/globals.map.jinja b/salt/vars/globals.map.jinja index 9ce509d7b..3265cde18 100644 --- a/salt/vars/globals.map.jinja +++ b/salt/vars/globals.map.jinja @@ -22,7 +22,7 @@ 'md_engine': INIT.PILLAR.global.mdengine, 'pipeline': INIT.PILLAR.global.pipeline, 'so_version': INIT.PILLAR.global.soversion, - 'so_docker_bip': DOCKER.bip, + 'so_docker_gateway': DOCKER.gateway, 'so_docker_range': DOCKER.range, 'url_base': INIT.PILLAR.global.url_base, 'so_model': INIT.GRAINS.get('sosmodel',''),