[WIP] is_leader_up works now, but members cannot join yet due to connection on 7980 being refused

Author: missingcharacter

tests/test.sh

@@ -11,6 +11,12 @@ E2D_BIN="${E2D_DIR}/e2d"
 CA_DIR="${SHARED_VOLUME_PATH}/ca"
 CA_KEY="${CA_DIR}/ca.key"
 CA_CRT="${CA_DIR}/ca.crt"
+CLIENT_CRT='./client.crt'
+CLIENT_KEY='./client.key'
+PEER_CRT='./peer.crt'
+PEER_KEY='./peer.key'
+SERVER_CRT='./server.crt'
+SERVER_KEY='./server.key'
 SNAP_DIR="${SHARED_VOLUME_PATH}/snapshots/"
 E2D_VAR_DIR='/var/lib/etcd'
 E2D_DATA_DIR="${E2D_VAR_DIR}/data"
@@ -85,16 +91,16 @@ function run_first_e2d() {
   generate_certs
   su ${TEST_USERNAME} -c "${E2D_BIN} run --snapshot-url file://${SNAP_DIR} \
     --data-dir=${E2D_DATA_DIR} \
-    --ca-cert=${SHARED_VOLUME_PATH}/ca/ca.crt \
-    --ca-key=${SHARED_VOLUME_PATH}/ca/ca.key \
-    --peer-cert=./peer.crt \
-    --peer-key=./peer.key \
-    --server-cert=./server.crt \
-    --server-key=./server.key"
+    --ca-cert=${CA_CRT} \
+    --ca-key=${CA_KEY} \
+    --peer-cert=${PEER_CRT} \
+    --peer-key=${PEER_KEY} \
+    --server-cert=${SERVER_CRT} \
+    --server-key=${SERVER_KEY}"
 }
 
 function is_leader_up() {
-  until curl -m 1 "${E2D_LEADER_NAME}:2379"; do
+  until curl --cert "${CLIENT_CRT}" --key "${CLIENT_KEY}" -m 1 -k "https://${E2D_LEADER_NAME}:2379"; do
     echo "${E2D_LEADER_NAME} is not up yet"
     sleep 5
   done
@@ -104,14 +110,14 @@ function is_leader_up() {
 function run_e2d() {
   generate_certs
   is_leader_up
-  su ${TEST_USERNAME} -c " run -n 3 --snapshot-url file://${SNAP_DIR} \
+  su ${TEST_USERNAME} -c "${E2D_BIN} run -n 3 --snapshot-url file://${SNAP_DIR} \
     --data-dir=${E2D_DATA_DIR} \
-    --ca-cert=${SHARED_VOLUME_PATH}/ca/ca.crt \
-    --ca-key=${SHARED_VOLUME_PATH}/ca/ca.key \
-    --peer-cert=./peer.crt \
-    --peer-key=./peer.key \
-    --server-cert=./server.crt \
-    --server-key=./server.key \
+    --ca-cert=${CA_CRT} \
+    --ca-key=${CA_KEY} \
+    --peer-cert=${PEER_CRT} \
+    --peer-key=${PEER_KEY} \
+    --server-cert=${SERVER_CRT} \
+    --server-key=${SERVER_KEY} \
     --bootstrap-addrs ${E2D_LEADER_NAME}:7980"
 }