fix merge

Mronyx · Oct 25, 2023 · 63a9499 · 63a9499
1 parent 50d924f
commit 63a9499
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go
@@ -128,12 +128,12 @@ const (
 	AnsibleStatusDir                       = "status"
 	AnsibleInventoryFlag                   = "-i"
 	AnsibleExtraArgsIdentitiesOnlyFlag     = "--ssh-extra-args=-o IdentitiesOnly=yes -o StrictHostKeyChecking=no"
-	AnsibleSSHParams                       = "-o IdentitiesOnly=yes -o StrictHostKeyChecking=no"
+	AnsibleSSHShellParams                  = "-o IdentitiesOnly=yes -o StrictHostKeyChecking=no"
+	AnsibleSSHInventoryParams              = "-o StrictHostKeyChecking=no"
 	AnsibleExtraVarsFlag                   = "--extra-vars"
-	AnsibleSSHUser                         = "ubuntu"
-	AnsibleAWSNodePrefix                   = "aws_node_"
 	CloudCLIBranch                         = "custom-vms-cloud-10"
-	DefaultConfigFileName                  = ".avalanche-cli"
+	OldConfigFileName                      = ".avalanche-cli"
+	DefaultConfigFileName                  = "config"
 	DefaultConfigFileType                  = "json"
 	WriteReadReadPerms                     = 0o644
 	AWSCloudService                        = "Amazon Web Services"
@@ -145,9 +145,11 @@ const (
 	GCPServiceAccountFilePathClusterConfig = "serviceAccountFilePath"
 	CustomVMDir                            = "vms"
 	GCPStaticIPPrefix                      = "static-ip"
+	AvaLabsOrg                             = "ava-labs"
 	AvalancheGoRepoName                    = "avalanchego"
 	SubnetEVMRepoName                      = "subnet-evm"
 	CliRepoName                            = "avalanche-cli"
+	MetricsEnabled                         = "MetricsEnabled"
 
 	AvalancheGoInstallDir = "avalanchego"
 	SubnetEVMInstallDir   = "subnet-evm"