Browse Source

added dualstack default from parent net

worker-9 4 years ago
parent
commit
47fe905438
3 changed files with 7 additions and 11 deletions
  1. 1 0
      compose/docker-compose.quickstart.yml
  2. 3 11
      functions/helpers.go
  3. 3 0
      models/node.go

+ 1 - 0
compose/docker-compose.quickstart.yml

@@ -34,6 +34,7 @@ services:
       SERVER_GRPC_CONN_STRING: "grpc.NETMAKER_BASE_DOMAIN:1443"
       SERVER_GRPC_CONN_STRING: "grpc.NETMAKER_BASE_DOMAIN:1443"
       COREDNS_ADDR: "SERVER_PUBLIC_IP"
       COREDNS_ADDR: "SERVER_PUBLIC_IP"
       GRPC_SSL: "on"
       GRPC_SSL: "on"
+      DNS_MODE: "on"
       SERVER_HTTP_HOST: "api.NETMAKER_BASE_DOMAIN"
       SERVER_HTTP_HOST: "api.NETMAKER_BASE_DOMAIN"
       SERVER_GRPC_HOST: "grpc.NETMAKER_BASE_DOMAIN"
       SERVER_GRPC_HOST: "grpc.NETMAKER_BASE_DOMAIN"
       API_PORT: "8081"
       API_PORT: "8081"

+ 3 - 11
functions/helpers.go

@@ -671,9 +671,7 @@ func UniqueAddress6(networkName string) (string, error) {
 		return "", err
 		return "", err
 	}
 	}
 	if network.IsDualStack == "no" {
 	if network.IsDualStack == "no" {
-		if networkName != "comms" {
-			return "", nil
-		}
+		return "", nil
 	}
 	}
 
 
 	offset := true
 	offset := true
@@ -687,14 +685,8 @@ func UniqueAddress6(networkName string) (string, error) {
 			offset = false
 			offset = false
 			continue
 			continue
 		}
 		}
-		if networkName == "comms" {
-			if IsIPUnique(networkName, ip.String(), database.INT_CLIENTS_TABLE_NAME, true) {
-				return ip.String(), err
-			}
-		} else {
-			if IsIPUnique(networkName, ip.String(), database.NODES_TABLE_NAME, true) {
-				return ip.String(), err
-			}
+		if IsIPUnique(networkName, ip.String(), database.NODES_TABLE_NAME, true) {
+			return ip.String(), err
 		}
 		}
 	}
 	}
 	//TODO
 	//TODO

+ 3 - 0
models/node.go

@@ -238,7 +238,10 @@ func (node *Node) SetDefaults() {
 			node.UDPHolePunch = "yes"
 			node.UDPHolePunch = "yes"
 		}
 		}
 	}
 	}
+	// == Parent Network settings ==
 	node.CheckInInterval = parentNetwork.DefaultCheckInInterval
 	node.CheckInInterval = parentNetwork.DefaultCheckInInterval
+	node.IsDualStack = parentNetwork.IsDualStack
+	// == node defaults if not set by parent ==
 	node.SetIPForwardingDefault()
 	node.SetIPForwardingDefault()
 	node.SetDNSOnDefault()
 	node.SetDNSOnDefault()
 	node.SetIsLocalDefault()
 	node.SetIsLocalDefault()