Multinode support for promenade encryption
Change-Id: Ie0a458008870cdfc8f6606c4d91c4f0cd7f36681
This commit is contained in:
parent
221ec46c26
commit
1a5706b8fa
|
@ -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 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_POOLS=${NTP_POOLS:-"0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org"}
|
||||||
export NTP_SERVERS=${NTP_SERVERS:-""}
|
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
|
# key-pair used for drydock/maas auth towards libvirt and access to
|
||||||
# the virtual nodes; auto-generated if no value provided
|
# the virtual nodes; auto-generated if no value provided
|
||||||
|
|
|
@ -33,6 +33,7 @@ docker run --rm -t \
|
||||||
-v "${GATE_DEPOT}:/gate" \
|
-v "${GATE_DEPOT}:/gate" \
|
||||||
-v "${CERT_DEPOT}:/certs" \
|
-v "${CERT_DEPOT}:/certs" \
|
||||||
-v "${SCRIPT_DEPOT}:/scripts" \
|
-v "${SCRIPT_DEPOT}:/scripts" \
|
||||||
|
-e "PROMENADE_ENCRYPTION_KEY=${PROMENADE_ENCRYPTION_KEY}" \
|
||||||
${DOCKER_RUN_OPTS[*]} \
|
${DOCKER_RUN_OPTS[*]} \
|
||||||
"${IMAGE_PROMENADE_CLI}" \
|
"${IMAGE_PROMENADE_CLI}" \
|
||||||
promenade \
|
promenade \
|
||||||
|
|
|
@ -21,7 +21,7 @@ source "${GATE_UTILS}"
|
||||||
rsync_cmd "${SCRIPT_DEPOT}/genesis.sh" "${GENESIS_NAME}:/root/airship/"
|
rsync_cmd "${SCRIPT_DEPOT}/genesis.sh" "${GENESIS_NAME}:/root/airship/"
|
||||||
|
|
||||||
set -o pipefail
|
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
|
set +o pipefail
|
||||||
|
|
||||||
if ! ssh_cmd n0 docker images | tail -n +2 | grep -v registry:5000 ; then
|
if ! ssh_cmd n0 docker images | tail -n +2 | grep -v registry:5000 ; then
|
||||||
|
|
Loading…
Reference in New Issue