undo more region test changes

hashicorp · Jun 12, 2019 · 87afced · 87afced
1 parent ee8b442
commit 87afced
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/command/agent/http_test.go b/command/agent/http_test.go
@@ -583,7 +583,7 @@ func TestHTTP_VerifyHTTPSClient_AfterConfigReload(t *testing.T) {
 	// Requests that specify a valid hostname, CA cert, and client
 	// certificate succeed.
 	tlsConf := &tls.Config{
-		ServerName: "client.global.nomad",
+		ServerName: "client.regionFoo.nomad",
 		RootCAs:    x509.NewCertPool(),
 		GetClientCertificate: func(*tls.CertificateRequestInfo) (*tls.Certificate, error) {
 			c, err := tls.LoadX509KeyPair(foocert, fookey)

diff --git a/helper/tlsutil/testdata/nomad-foo-csr.json b/helper/tlsutil/testdata/nomad-foo-csr.json
@@ -1,8 +1,8 @@
 {
-    "CN": "global.nomad",
+    "CN": "regionFoo.nomad",
     "hosts": [
-	"server.global.nomad",
-	"client.global.nomad"
+	"server.regionFoo.nomad",
+	"client.regionFoo.nomad"
     ],
     "key": {
         "algo": "ecdsa",

diff --git a/nomad/server_test.go b/nomad/server_test.go
@@ -210,7 +210,7 @@ func TestServer_Regions(t *testing.T) {
 func TestServer_Reload_Vault(t *testing.T) {
 	t.Parallel()
 	s1 := TestServer(t, func(c *Config) {
-		c.Region = "regionFoo"
+		c.Region = "global"
 	})
 	defer s1.Shutdown()
 
@@ -433,7 +433,7 @@ func TestServer_Reload_TLSConnections_PlaintextToTLS_OnlyRPC(t *testing.T) {
 	node := mock.Node()
 	req := &structs.NodeRegisterRequest{
 		Node:         node,
-		WriteRequest: structs.WriteRequest{Region: "regionFoo"},
+		WriteRequest: structs.WriteRequest{Region: "global"},
 	}
 
 	var resp structs.GenericResponse