From 50145eafa38a9e58d333d6a5665c4c41d600ddd8 Mon Sep 17 00:00:00 2001
From: Sydney Anne Erickson <sydney@elixxir.io>
Date: Tue, 19 May 2020 14:21:15 -0700
Subject: [PATCH] Update configs to only take in one node, gateway, and DB
address for server
---
basice2e/server-1.yaml | 23 ++++-------------------
basice2e/server-2.yaml | 24 ++++--------------------
basice2e/server-3.yaml | 24 ++++--------------------
basice2e/server-4.yaml | 24 ++++--------------------
basice2e/server-5.yaml | 24 ++++--------------------
smokeinfra/server-1.yaml | 17 ++++-------------
smokeinfra/server-2.yaml | 17 ++++-------------
smokeinfra/server-3.yaml | 17 ++++-------------
8 files changed, 32 insertions(+), 138 deletions(-)
diff --git a/basice2e/server-1.yaml b/basice2e/server-1.yaml
index c5fd5f8..c619deb 100644
--- a/basice2e/server-1.yaml
+++ b/basice2e/server-1.yaml
@@ -16,31 +16,16 @@ node:
cert: "../keys/cmix.rip.crt"
key: "../keys/cmix.rip.key"
log: "results/servers/server-1.log"
- addresses:
- - "127.0.0.1:50000"
- - "127.0.0.1:50001"
- - "127.0.0.1:50002"
- - "127.0.0.1:50003"
- - "127.0.0.1:50004"
+ address: "127.0.0.1:50000"
database:
name: "node1"
username: "cmix_server"
password: ""
- addresses:
- - ""
- - ""
- - ""
- - ""
- - ""
-gateways:
+ address: ""
+gateway:
paths:
cert: "../keys/cmix.rip.crt"
- addresses:
- - "127.0.0.1:8440"
- - "127.0.0.1:8441"
- - "127.0.0.1:8442"
- - "127.0.0.1:8443"
- - "127.0.0.1:8444"
+ address: "127.0.0.1:8440"
permissioning:
paths:
cert: "../keys/cmix.rip.crt"
diff --git a/basice2e/server-2.yaml b/basice2e/server-2.yaml
index 2b74ef9..b629d5f 100644
--- a/basice2e/server-2.yaml
+++ b/basice2e/server-2.yaml
@@ -16,32 +16,16 @@ node:
cert: "../keys/cmix.rip.crt"
key: "../keys/cmix.rip.key"
log: "results/servers/server-2.log"
- addresses:
- - "127.0.0.1:50000"
- - "127.0.0.1:50001"
- - "127.0.0.1:50002"
- - "127.0.0.1:50003"
- - "127.0.0.1:50004"
- - "127.0.0.1:50005"
+ address: "127.0.0.1:50001"
database:
name: "node2"
username: "cmix_server"
password: ""
- addresses:
- - ""
- - ""
- - ""
- - ""
- - ""
-gateways:
+ address: ""
+gateway:
paths:
cert: "../keys/cmix.rip.crt"
- addresses:
- - "127.0.0.1:8440"
- - "127.0.0.1:8441"
- - "127.0.0.1:8442"
- - "127.0.0.1:8443"
- - "127.0.0.1:8444"
+ address: "127.0.0.1:8441"
permissioning:
paths:
cert: "../keys/cmix.rip.crt"
diff --git a/basice2e/server-3.yaml b/basice2e/server-3.yaml
index 7aa772c..69e24bb 100644
--- a/basice2e/server-3.yaml
+++ b/basice2e/server-3.yaml
@@ -16,32 +16,16 @@ node:
cert: "../keys/cmix.rip.crt"
key: "../keys/cmix.rip.key"
log: "results/servers/server-3.log"
- addresses:
- - "127.0.0.1:50000"
- - "127.0.0.1:50001"
- - "127.0.0.1:50002"
- - "127.0.0.1:50003"
- - "127.0.0.1:50004"
- - "127.0.0.1:50005"
+ address: "127.0.0.1:50002"
database:
name: "node3"
username: "cmix_server"
password: ""
- addresses:
- - ""
- - ""
- - ""
- - ""
- - ""
-gateways:
+ address: ""
+gateway:
paths:
cert: "../keys/cmix.rip.crt"
- addresses:
- - "127.0.0.1:8440"
- - "127.0.0.1:8441"
- - "127.0.0.1:8442"
- - "127.0.0.1:8443"
- - "127.0.0.1:8444"
+ address: "127.0.0.1:8442"
permissioning:
paths:
cert: "../keys/cmix.rip.crt"
diff --git a/basice2e/server-4.yaml b/basice2e/server-4.yaml
index 9af4400..8737657 100644
--- a/basice2e/server-4.yaml
+++ b/basice2e/server-4.yaml
@@ -16,32 +16,16 @@ node:
cert: "../keys/cmix.rip.crt"
key: "../keys/cmix.rip.key"
log: "results/servers/server-4.log"
- addresses:
- - "127.0.0.1:50000"
- - "127.0.0.1:50001"
- - "127.0.0.1:50002"
- - "127.0.0.1:50003"
- - "127.0.0.1:50004"
- - "127.0.0.1:50005"
+ address: "127.0.0.1:50003"
database:
name: "node4"
username: "cmix_server"
password: ""
- addresses:
- - ""
- - ""
- - ""
- - ""
- - ""
-gateways:
+ address: ""
+gateway:
paths:
cert: "../keys/cmix.rip.crt"
- addresses:
- - "127.0.0.1:8440"
- - "127.0.0.1:8441"
- - "127.0.0.1:8442"
- - "127.0.0.1:8443"
- - "127.0.0.1:8444"
+ address: "127.0.0.1:8443"
permissioning:
paths:
cert: "../keys/cmix.rip.crt"
diff --git a/basice2e/server-5.yaml b/basice2e/server-5.yaml
index 2f7f8ea..9817f3a 100644
--- a/basice2e/server-5.yaml
+++ b/basice2e/server-5.yaml
@@ -16,32 +16,16 @@ node:
cert: "../keys/cmix.rip.crt"
key: "../keys/cmix.rip.key"
log: "results/servers/server-5.log"
- addresses:
- - "127.0.0.1:50000"
- - "127.0.0.1:50001"
- - "127.0.0.1:50002"
- - "127.0.0.1:50003"
- - "127.0.0.1:50004"
- - "127.0.0.1:50005"
+ address: "127.0.0.1:50004"
database:
name: "node5"
username: "cmix_server"
password: ""
- addresses:
- - ""
- - ""
- - ""
- - ""
- - ""
-gateways:
+ address: ""
+gateway:
paths:
cert: "../keys/cmix.rip.crt"
- addresses:
- - "127.0.0.1:8440"
- - "127.0.0.1:8441"
- - "127.0.0.1:8442"
- - "127.0.0.1:8443"
- - "127.0.0.1:8444"
+ address: "127.0.0.1:8444"
permissioning:
paths:
cert: "../keys/cmix.rip.crt"
diff --git a/smokeinfra/server-1.yaml b/smokeinfra/server-1.yaml
index 7207589..ca4811c 100644
--- a/smokeinfra/server-1.yaml
+++ b/smokeinfra/server-1.yaml
@@ -14,25 +14,16 @@ node:
cert: "../keys/cmix.rip.crt"
key: "../keys/cmix.rip.key"
log: "results/server-1.log"
- addresses:
- - "localhost:60000"
- - "localhost:60001"
- - "localhost:60002"
+ address: "localhost:60000"
database:
name: "node1"
username: "cmix_server"
password: ""
- addresses:
- - ""
- - ""
- - ""
-gateways:
+ address: ""
+gateway:
paths:
cert: "../keys/cmix.rip.crt"
- addresses:
- - "localhost:9440"
- - "localhost:9441"
- - "localhost:9442"
+ address: "localhost:9440"
permissioning:
paths:
cert: "../keys/cmix.rip.crt"
diff --git a/smokeinfra/server-2.yaml b/smokeinfra/server-2.yaml
index dcfd879..ad83d9c 100644
--- a/smokeinfra/server-2.yaml
+++ b/smokeinfra/server-2.yaml
@@ -14,25 +14,16 @@ node:
cert: "../keys/cmix.rip.crt"
key: "../keys/cmix.rip.key"
log: "results/server-2.log"
- addresses:
- - "localhost:60000"
- - "localhost:60001"
- - "localhost:60002"
+ address: "localhost:60001"
database:
name: "node2"
username: "cmix_server"
password: ""
- addresses:
- - ""
- - ""
- - ""
-gateways:
+ address: ""
+gateway:
paths:
cert: "../keys/cmix.rip.crt"
- addresses:
- - "localhost:9440"
- - "localhost:9441"
- - "localhost:9442"
+ address: "localhost:9441"
permissioning:
paths:
cert: "../keys/cmix.rip.crt"
diff --git a/smokeinfra/server-3.yaml b/smokeinfra/server-3.yaml
index 54d0922..65f1ed7 100644
--- a/smokeinfra/server-3.yaml
+++ b/smokeinfra/server-3.yaml
@@ -14,25 +14,16 @@ node:
cert: "../keys/cmix.rip.crt"
key: "../keys/cmix.rip.key"
log: "results/server-3.log"
- addresses:
- - "localhost:60000"
- - "localhost:60001"
- - "localhost:60002"
+ address: "localhost:60002"
database:
name: "node3"
username: "cmix_server"
password: ""
- addresses:
- - ""
- - ""
- - ""
-gateways:
+ address: ""
+gateway:
paths:
cert: "../keys/cmix.rip.crt"
- addresses:
- - "localhost:9440"
- - "localhost:9441"
- - "localhost:9442"
+ address: "localhost:9442"
permissioning:
paths:
cert: "../keys/cmix.rip.crt"
--
GitLab