From 1a5706b8fa73f689895d1fc58463c5f264a5f25c Mon Sep 17 00:00:00 2001 From: Sirajudeen Date: Mon, 15 Apr 2019 10:10:11 -0700 Subject: [PATCH] Multinode support for promenade encryption Change-Id: Ie0a458008870cdfc8f6606c4d91c4f0cd7f36681 --- tools/multi_nodes_gate/airship_gate/lib/config.sh | 1 + tools/multi_nodes_gate/airship_gate/stages/build-scripts.sh | 1 + tools/multi_nodes_gate/airship_gate/stages/genesis.sh | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/multi_nodes_gate/airship_gate/lib/config.sh b/tools/multi_nodes_gate/airship_gate/lib/config.sh index c39d9608..dbb3793e 100644 --- a/tools/multi_nodes_gate/airship_gate/lib/config.sh +++ b/tools/multi_nodes_gate/airship_gate/lib/config.sh @@ -22,6 +22,7 @@ export VIRSH_CPU_OPTS=${VIRSH_CPU_OPTS:-host} export UPSTREAM_DNS=${UPSTREAM_DNS:-"8.8.8.8 8.8.4.4"} export NTP_POOLS=${NTP_POOLS:-"0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org"} export NTP_SERVERS=${NTP_SERVERS:-""} +export PROMENADE_ENCRYPTION_KEY=${PROMENADE_ENCRYPTION_KEY:-MjI1N2ZiMjMzYjI0ZmVkZDU4} # key-pair used for drydock/maas auth towards libvirt and access to # the virtual nodes; auto-generated if no value provided diff --git a/tools/multi_nodes_gate/airship_gate/stages/build-scripts.sh b/tools/multi_nodes_gate/airship_gate/stages/build-scripts.sh index cce2d90e..5f5a1ca7 100755 --- a/tools/multi_nodes_gate/airship_gate/stages/build-scripts.sh +++ b/tools/multi_nodes_gate/airship_gate/stages/build-scripts.sh @@ -33,6 +33,7 @@ docker run --rm -t \ -v "${GATE_DEPOT}:/gate" \ -v "${CERT_DEPOT}:/certs" \ -v "${SCRIPT_DEPOT}:/scripts" \ + -e "PROMENADE_ENCRYPTION_KEY=${PROMENADE_ENCRYPTION_KEY}" \ ${DOCKER_RUN_OPTS[*]} \ "${IMAGE_PROMENADE_CLI}" \ promenade \ diff --git a/tools/multi_nodes_gate/airship_gate/stages/genesis.sh b/tools/multi_nodes_gate/airship_gate/stages/genesis.sh index 9717857f..c78a6892 100755 --- a/tools/multi_nodes_gate/airship_gate/stages/genesis.sh +++ b/tools/multi_nodes_gate/airship_gate/stages/genesis.sh @@ -21,7 +21,7 @@ source "${GATE_UTILS}" rsync_cmd "${SCRIPT_DEPOT}/genesis.sh" "${GENESIS_NAME}:/root/airship/" set -o pipefail -ssh_cmd "${GENESIS_NAME}" /root/airship/genesis.sh 2>&1 | tee -a "${LOG_FILE}" +ssh_cmd_raw "${GENESIS_NAME}" "PROMENADE_ENCRYPTION_KEY=${PROMENADE_ENCRYPTION_KEY} /root/airship/genesis.sh" 2>&1 | tee -a "${LOG_FILE}" set +o pipefail if ! ssh_cmd n0 docker images | tail -n +2 | grep -v registry:5000 ; then