From f55c1a40789a230960169eef229fc1ccea97995c Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Fri, 21 Jul 2023 16:59:22 -0400 Subject: [PATCH] DOCKERBIP change --- salt/docker/init.sls | 2 +- setup/so-functions | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/salt/docker/init.sls b/salt/docker/init.sls index 5f645a9a0..8ebbcdb53 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 }} + - gateway: {{ DOCKER.bip | split("/")[0]}} - options: com.docker.network.bridge.name: 'sobridge' com.docker.network.driver.mtu: '1500' diff --git a/setup/so-functions b/setup/so-functions index d5845363a..a088b7f8a 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1484,9 +1484,9 @@ create_global() { if [ -z "$DOCKERNET" ]; then DOCKERNET=172.17.1.0 - DOCKERBIP=$(echo $DOCKERNET | awk -F'.' '{print $1,$2,$3,1}' OFS='.') + DOCKERBIP=$(echo $DOCKERNET | awk -F'.' '{print $1,$2,$3,1}' OFS='.')/24 else - DOCKERBIP=$(echo $DOCKERNET | awk -F'.' '{print $1,$2,$3,1}' OFS='.') + DOCKERBIP=$(echo $DOCKERNET | awk -F'.' '{print $1,$2,$3,1}' OFS='.')/24 fi if [ -f "$global_pillar_file" ]; then