change ranges

salt/common/files/daemon.json

@@ -1,13 +1,11 @@
-{%- set DOCKERRANGE = salt['pillar.get']('docker:range', '172.17.0.0/24') %}
-{%- set DOCKERBIND = salt['pillar.get']('docker:bip', '172.17.0.1/24') %}
 {
   "registry-mirrors": [
     "https://:5000"
   ],
-  "bip": "{{ DOCKERBIND }}",
+  "bip": "172.17.0.1/24",
   "default-address-pools": [
     {
-      "base": "{{ DOCKERRANGE }}",
+      "base": "172.17.0.0/24",
       "size": 24
     }
   ]

salt/docker/defaults.yaml

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

setup/so-functions

@@ -253,7 +253,7 @@ collect_dns_domain() {
 
 collect_dockernet() {
 	if ! whiptail_dockernet_check; then
-		whiptail_dockernet_sosnet "172.17.0.0"
+		whiptail_dockernet_sosnet "172.17.1.0"
 
 		while ! valid_ip4 "$DOCKERNET"; do
 			whiptail_invalid_input
@@ -1100,7 +1100,7 @@ docker_registry() {
 	logCmd "mkdir -p /etc/docker"
 	# This will get applied so docker can attempt to start
 	if [ -z "$DOCKERNET" ]; then
-		DOCKERNET=172.17.0.0
+		DOCKERNET=172.17.1.0
 	fi
 	# Make the host use the manager docker registry
 	DNETBIP=$(echo $DOCKERNET | awk -F'.' '{print $1,$2,$3,1}' OFS='.')/24
@@ -1483,7 +1483,7 @@ create_global() {
 	fi
 
 	if [ -z "$DOCKERNET" ]; then
-		DOCKERNET=172.17.0.0
+		DOCKERNET=172.17.1.0
 		DOCKERBIP=$(echo $DOCKERNET | awk -F'.' '{print $1,$2,$3,1}' OFS='.')/24
 	else
 		DOCKERBIP=$(echo $DOCKERNET | awk -F'.' '{print $1,$2,$3,1}' OFS='.')/24