From 8d2dce6f6b3347870f54fc352ffd9ace4cc435df Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Sat, 25 Sep 2021 21:34:24 +0000
Subject: [PATCH] allows private addresses if not public network (#20178)

(cherry picked from commit c4f2e5f88c1990bbe09cd94ee1ad660d8f803d38)

# Conflicts:
#	net/net.sh

Co-authored-by: behzad nouri <behzadnouri@gmail.com>
---
 net/common.sh | 1 +
 net/net.sh    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/net/common.sh b/net/common.sh
index fbe534576a..8e46adb72e 100644
--- a/net/common.sh
+++ b/net/common.sh
@@ -69,6 +69,7 @@ loadConfigFile() {
     entrypointIp=${validatorIpList[0]}
   else
     entrypointIp=${validatorIpListPrivate[0]}
+    maybeAllowPrivateAddr='--allow-private-addr'
   fi
 
   buildSshOptions
diff --git a/net/net.sh b/net/net.sh
index 6904ea76f3..7005866cfb 100755
--- a/net/net.sh
+++ b/net/net.sh
@@ -910,6 +910,8 @@ while [[ -n $1 ]]; do
       extraPrimordialStakes=$2
       shift 2
     elif [[ $1 = --allow-private-addr ]]; then
+      # May also be added by loadConfigFile if 'gce.sh create' was invoked
+      # without -P.
       maybeAllowPrivateAddr="$1"
       shift 1
     elif [[ $1 = --accounts-db-skip-shrink ]]; then