Skip to content

Commit d7369ef

Browse files
committed
Cluster-nodes use client keys for authentication
Signed-off-by: Mark Hannum <mhannum@bloomberg.net>
1 parent 94113d1 commit d7369ef

File tree

3 files changed

+14
-0
lines changed

3 files changed

+14
-0
lines changed

tests/setup

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,7 @@ setup_db() {
285285
REP_ENV_VARS="${DBDIR}/replicant_env_vars"
286286
#echo "export COMDB2_ROOT=$COMDB2_ROOT" >> ${REP_ENV_VARS}
287287
echo "export COMDB2_ROOT=$TESTDIR" >> ${REP_ENV_VARS}
288+
echo "export CDB2_CONFIG_FILE=$CDB2_CONFIG" >> ${REP_ENV_VARS}
288289
CMD="cd ${DBDIR}; source ${REP_ENV_VARS} ; ${DEBUG_PREFIX} $COMDB2_EXE ${DBNAME} ${PARAMS} 2>&1 | tee $TESTDIR/${DBNAME}.db"
289290
echo "!$TESTCASE: starting"
290291
for node in $CLUSTER; do
@@ -301,6 +302,7 @@ setup_db() {
301302
if [[ -n ${DEBUG_PREFIX} && ${INTERACTIVE_DEBUG} -eq 1 ]]; then
302303
echo -e "!$TESTCASE: Execute the following command on ${node}: ${TEXTCOLOR}${CMD}${NOCOLOR}"
303304
else
305+
scp $SSH_OPT $CDB2_CONFIG $node:$CDB2_CONFIG
304306
scp $SSH_OPT ${REP_ENV_VARS} $node:${REP_ENV_VARS}
305307
# could also use connection sharing and close master ssh session in unsetup
306308
ssh -n $SSH_OPT -tt $node ${CMD} &> $LOGDIR/${DBNAME}.${node}.db &

tests/testcase.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ export DBDIR=$(TESTDIR)/$(DBNAME)
3939
export TMPDIR=$(TESTDIR)/tmp
4040
export CDB2_CONFIG=$(abspath $(DBDIR)/comdb2db.cfg)
4141
export CDB2_OPTIONS=--cdb2cfg $(CDB2_CONFIG)
42+
export CDB2_CONFIG_FILE=$(CDB2_CONFIG)
4243
export COMDB2_ROOT=$(TESTDIR)
4344
export COMDB2_UNITTEST?=0
4445

tests/tools/keygen.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,3 +201,14 @@ for crt in `find ${CADIR} -name 'server*.crt'`; do
201201
-keyfile ${CADIR}/root.key -cert ${CADIR}/root.crt
202202
done
203203
openssl ca -config ${CADIR}/ca.cnf -gencrl -out ${CADIR}/client.crl
204+
205+
for node in $CLUSTER; do
206+
if [ "$node" = "$myhostname" ] ; then
207+
continue
208+
fi
209+
scp -o StrictHostKeyChecking=no $CADIR/client.crt $node:$CADIR/client.crt
210+
scp -o StrictHostKeyChecking=no $CADIR/client.key $node:$CADIR/client.key
211+
scp -o StrictHostKeyChecking=no $CADIR/root.crt $node:$CADIR/root.crt
212+
scp -o StrictHostKeyChecking=no $CADIR/root.crl $node:$CADIR/root.crl
213+
done
214+

0 commit comments

Comments
 (0)