Replace 'localnodes' config with 'nodename'

Also some cleanup

8 files changed, 15 insertions, 38 deletions

diff --git a/test/catlfish-test-local-frontend-1.cfg b/test/catlfish-test-local-frontend-1.cfg
index 4867672..8ab141c 100644
--- a/test/catlfish-test-local-frontend-1.cfg
+++ b/test/catlfish-test-local-frontend-1.cfg
@@ -1,18 +1,12 @@
-localnodes:
-        - frontend-1
+nodename: frontend-1
 
-frontendaddresses:
-        frontend-1: 127.0.0.1:8082
+frontendaddress: 127.0.0.1:8082
 
-ctapiaddresses:
-        frontend-1: 127.0.0.1:8080
+ctapiaddress: 127.0.0.1:8080
 
-storageaddresses:
-        frontend-1: 127.0.0.1:8081
+storageaddress: 127.0.0.1:8081
 
-
-#publichttpaddresses:
-#        frontend-1: 127.0.0.1:8090
+#publichttpaddress: 127.0.0.1:8090
 
 paths:
         configdir: .
diff --git a/test/catlfish-test-local-frontend-2.cfg b/test/catlfish-test-local-frontend-2.cfg
index 2a6462a..3a2e649 100644
--- a/test/catlfish-test-local-frontend-2.cfg
+++ b/test/catlfish-test-local-frontend-2.cfg
@@ -1,5 +1,4 @@
-localnodes:
-        - frontend-2
+nodename: frontend-2
 
 paths:
         configdir: .
diff --git a/test/catlfish-test-local-frontend-3.cfg b/test/catlfish-test-local-frontend-3.cfg
index 430cef6..27dab58 100644
--- a/test/catlfish-test-local-frontend-3.cfg
+++ b/test/catlfish-test-local-frontend-3.cfg
@@ -1,5 +1,4 @@
-localnodes:
-        - frontend-3
+nodename: frontend-3
 
 paths:
         configdir: .
diff --git a/test/catlfish-test-local-merge-1.cfg b/test/catlfish-test-local-merge-1.cfg
index 389a440..2de391e 100644
--- a/test/catlfish-test-local-merge-1.cfg
+++ b/test/catlfish-test-local-merge-1.cfg
@@ -1,8 +1,5 @@
 nodename: merge-1
 
-localnodes:
-        - merge-1
-
 paths:
         configdir: .
         mergedb: machine/merge-1/db
diff --git a/test/catlfish-test-local-merge-2.cfg b/test/catlfish-test-local-merge-2.cfg
index d42cbf3..9a83566 100644
--- a/test/catlfish-test-local-merge-2.cfg
+++ b/test/catlfish-test-local-merge-2.cfg
@@ -1,11 +1,7 @@
-localnodes:
-        - merge-2
-
-addresses:
-        merge-2: 127.0.0.1:8182
-
 nodename: merge-2
 
+mergeaddress: 127.0.0.1:8182
+
 #dbbackend: permdb
 
 paths:
diff --git a/test/catlfish-test-local-merge-3.cfg b/test/catlfish-test-local-merge-3.cfg
index f6da89e..8c4b4c6 100644
--- a/test/catlfish-test-local-merge-3.cfg
+++ b/test/catlfish-test-local-merge-3.cfg
@@ -1,11 +1,7 @@
-localnodes:
-        - merge-3
-
-addresses:
-        merge-3: 127.0.0.1:8183
-
 nodename: merge-3
 
+mergeaddress: 127.0.0.1:8183
+
 paths:
         configdir: .
         knownroots: known_roots
diff --git a/test/catlfish-test-local-signing-1.cfg b/test/catlfish-test-local-signing-1.cfg
index 0eccc94..a2eaff5 100644
--- a/test/catlfish-test-local-signing-1.cfg
+++ b/test/catlfish-test-local-signing-1.cfg
@@ -1,8 +1,6 @@
-localnodes:
-        - signing-1
+nodename: signing-1
 
-addresses:
-        signing-1: 127.0.0.1:8088
+signingaddress: 127.0.0.1:8088
 
 paths:
         configdir: .
diff --git a/test/catlfish-test-local-statusserver.cfg b/test/catlfish-test-local-statusserver.cfg
index 190c611..cef11e6 100644
--- a/test/catlfish-test-local-statusserver.cfg
+++ b/test/catlfish-test-local-statusserver.cfg
@@ -1,8 +1,6 @@
-localnodes:
-        - statusserver
+nodename: statusserver
 
-publichttpaddresses:
-        statusserver: 127.0.0.1:9080
+publichttpaddress: 127.0.0.1:9080
 
 paths:
         configdir: .