summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMagnus Ahltorp <map@kth.se>2015-06-18 09:20:14 +0100
committerLinus Nordberg <linus@nordu.net>2015-07-31 15:51:29 +0200
commit803adf14ec4116d2997feca38c4c259d5d47f71a (patch)
tree310a31650464d3eb69792f2b45ecf74b042ac615 /test
parentb6af0ebacb8cda356edc4769c2751eea06d43aea (diff)
Preliminary merge secondary support. Change merge db to lowercase.
Diffstat (limited to 'test')
-rw-r--r--test/catlfish-test-local-merge-2.cfg18
-rw-r--r--test/catlfish-test.cfg5
2 files changed, 23 insertions, 0 deletions
diff --git a/test/catlfish-test-local-merge-2.cfg b/test/catlfish-test-local-merge-2.cfg
new file mode 100644
index 0000000..28c4eda
--- /dev/null
+++ b/test/catlfish-test-local-merge-2.cfg
@@ -0,0 +1,18 @@
+localnodes:
+ - merge-2
+
+addresses:
+ merge-2: 127.0.0.1:8181
+
+nodename: merge-2
+
+paths:
+ configdir: .
+ knownroots: tests/known_roots
+ mergedb: tests/mergedb-secondary
+ https_certfile: tests/httpscert/httpscert-1.pem
+ https_keyfile: tests/httpscert/httpskey-1.pem
+ https_cacertfile: tests/httpsca/demoCA/cacert.pem
+ publickeys: tests/publickeys
+ logpublickey: tests/keys/logkey.pem
+ privatekeys: tests/privatekeys
diff --git a/test/catlfish-test.cfg b/test/catlfish-test.cfg
index 6cb3bed..77539b6 100644
--- a/test/catlfish-test.cfg
+++ b/test/catlfish-test.cfg
@@ -15,6 +15,11 @@ signingnodes:
mergenodes:
- name: merge-1
+ address: localhost:8180
+ - name: merge-2
+ address: localhost:8181
+
+primarymergenode: merge-1
storage-quorum-size: 1