changed account id to tenant id

config/config.go

@@ -71,7 +71,7 @@ type ServerConfig struct {
 	MetricsExporter            string    `yaml:"metrics_exporter"`
 	BasicAuth                  string    `yaml:"basic_auth"`
 	LicenseValue               string    `yaml:"license_value"`
-	NetmakerAccountID          string    `yaml:"netmaker_account_id"`
+	NetmakerAccountID          string    `yaml:"netmaker_tenant_id"`
 	IsEE                       string    `yaml:"is_ee"`
 	StunPort                   int       `yaml:"stun_port"`
 	StunList                   string    `yaml:"stun_list"`

scripts/netmaker.default.env

@@ -15,7 +15,7 @@ MQ_USERNAME=
 # The password to set for MQ access
 MQ_PASSWORD=
 INSTALL_TYPE=
-NETMAKER_ACCOUNT_ID=
+NETMAKER_TENANT_ID=
 LICENSE_KEY=
 SERVER_IMAGE_TAG=
 UI_IMAGE_TAG=

scripts/nm-quick.sh

@@ -291,7 +291,7 @@ save_config() { (
 	fi
 	# version-specific entries
 	if [ "$INSTALL_TYPE" = "ee" ]; then
-		save_config_item NETMAKER_ACCOUNT_ID "$ACCOUNT_ID"
+		save_config_item NETMAKER_TENANT_ID "$TENANT_ID"
 		save_config_item LICENSE_KEY "$LICENSE_KEY"
 		save_config_item METRICS_EXPORTER "on"
 		save_config_item PROMETHEUS "on"
@@ -574,9 +574,9 @@ set_install_vars() {
 		while [ -z "$LICENSE_KEY" ]; do
 			read -p "License Key: " LICENSE_KEY
 		done
-		unset ACCOUNT_ID
-		while [ -z ${ACCOUNT_ID} ]; do
-			read -p "Tenant ID: " ACCOUNT_ID
+		unset TENANT_ID
+		while [ -z ${TENANT_ID} ]; do
+			read -p "Tenant ID: " TENANT_ID
 		done
 	fi
 
@@ -709,7 +709,7 @@ set_install_vars() {
 	echo "     public ip: $SERVER_HOST"
 	if [ "$INSTALL_TYPE" = "ee" ]; then
 		echo "       license: $LICENSE_KEY"
-		echo "    account id: $ACCOUNT_ID"
+		echo "    account id: $TENANT_ID"
 	fi
 	echo "-----------------------------------------------------------------"
 	echo "Confirm Settings for Installation"

servercfg/serverconf.go

@@ -672,7 +672,7 @@ func GetLicenseKey() string {
 
 // GetNetmakerAccountID - get's the associated, Netmaker, account ID to verify ownership
 func GetNetmakerAccountID() string {
-	netmakerAccountID := os.Getenv("NETMAKER_ACCOUNT_ID")
+	netmakerAccountID := os.Getenv("NETMAKER_TENANT_ID")
 	if netmakerAccountID == "" {
 		netmakerAccountID = config.Config.Server.NetmakerAccountID
 	}