Clean up migration to separate remoteva executable (#7787)

Fixes #7733

Author: aarongable

cmd/boulder/main_test.go

@@ -40,11 +40,7 @@ func TestConfigValidation(t *testing.T) {
 		case "boulder-sa":
 			fileNames = []string{"sa.json"}
 		case "boulder-va":
-			fileNames = []string{
-				"va.json",
-				"va-remote-a.json",
-				"va-remote-b.json",
-			}
+			fileNames = []string{"va.json"}
 		case "remoteva":
 			fileNames = []string{
 				"remoteva-a.json",

test/config-next/va-remote-a.json

@@ -52,16 +52,6 @@
 				"serverAddress": "rva1.service.consul:9498",
 				"timeout": "15s",
 				"hostOverride": "rva1.boulder"
-			},
-			{
-				"serverAddress": "rva2.service.consul:9897",
-				"timeout": "15s",
-				"hostOverride": "rva2.boulder"
-			},
-			{
-				"serverAddress": "rva2.service.consul:9998",
-				"timeout": "15s",
-				"hostOverride": "rva2.boulder"
 			}
 		],
 		"maxRemoteValidationFailures": 1,

test/config-next/va-remote-b.json

@@ -49,16 +49,6 @@
 				"serverAddress": "rva1.service.consul:9498",
 				"timeout": "15s",
 				"hostOverride": "rva1.boulder"
-			},
-			{
-				"serverAddress": "rva2.service.consul:9897",
-				"timeout": "15s",
-				"hostOverride": "rva2.boulder"
-			},
-			{
-				"serverAddress": "rva2.service.consul:9998",
-				"timeout": "15s",
-				"hostOverride": "rva2.boulder"
 			}
 		],
 		"maxRemoteValidationFailures": 1,

test/config-next/va.json

@@ -16,21 +16,13 @@
 
 # Keep these ports in sync with consul/config.hcl
 SERVICES = (
-    Service('boulder-remoteva-a',
-        8011, 9397, 'rva.boulder',
-        ('./bin/boulder', 'boulder-va', '--config', os.path.join(config_dir, 'va-remote-a.json'), '--addr', ':9397', '--debug-addr', ':8011'),
-        None),
-    Service('boulder-remoteva-b',
-        8012, 9498, 'rva.boulder',
-        ('./bin/boulder', 'boulder-va', '--config', os.path.join(config_dir, 'va-remote-b.json'), '--addr', ':9498', '--debug-addr', ':8012'),
-        None),
     Service('remoteva-a',
-        8211, 9897, 'rva.boulder',
-        ('./bin/boulder', 'remoteva', '--config', os.path.join(config_dir, 'remoteva-a.json'), '--addr', ':9897', '--debug-addr', ':8211'),
+        8011, 9397, 'rva.boulder',
+        ('./bin/boulder', 'remoteva', '--config', os.path.join(config_dir, 'remoteva-a.json'), '--addr', ':9397', '--debug-addr', ':8011'),
         None),
     Service('remoteva-b',
-        8212, 9998, 'rva.boulder',
-        ('./bin/boulder', 'remoteva', '--config', os.path.join(config_dir, 'remoteva-b.json'), '--addr', ':9998', '--debug-addr', ':8212'),
+        8012, 9498, 'rva.boulder',
+        ('./bin/boulder', 'remoteva', '--config', os.path.join(config_dir, 'remoteva-b.json'), '--addr', ':9498', '--debug-addr', ':8012'),
         None),
     Service('boulder-sa-1',
         8003, 9395, 'sa.boulder',
@@ -65,11 +57,11 @@
     Service('boulder-va-1',
         8004, 9392, 'va.boulder',
         ('./bin/boulder', 'boulder-va', '--config', os.path.join(config_dir, 'va.json'), '--addr', ':9392', '--debug-addr', ':8004'),
-        ('boulder-remoteva-a', 'boulder-remoteva-b', 'remoteva-a', 'remoteva-b')),
+        ('remoteva-a', 'remoteva-b')),
     Service('boulder-va-2',
         8104, 9492, 'va.boulder',
         ('./bin/boulder', 'boulder-va', '--config', os.path.join(config_dir, 'va.json'), '--addr', ':9492', '--debug-addr', ':8104'),
-        ('boulder-remoteva-a', 'boulder-remoteva-b', 'remoteva-a', 'remoteva-b')),
+        ('remoteva-a', 'remoteva-b')),
     Service('boulder-ca-1',
         8001, 9393, 'ca.boulder',
         ('./bin/boulder', 'boulder-ca', '--config', os.path.join(config_dir, 'ca.json'), '--addr', ':9393', '--debug-addr', ':8001'),