From b96b0f0bd52e07c9da15b224191920b6e6a6fe88 Mon Sep 17 00:00:00 2001 From: Sirajudeen Date: Wed, 10 Apr 2019 15:12:59 -0700 Subject: [PATCH] [pegleg] - set passphrase and salt to pegleg Setting PEGLEG_PASSPHRASE and PEGLEG_SALT to pegleg container to use it for encryption/decryption. Change-Id: I2c5c01fb0ef7366dbc35d4f8730ac1aa9ca63db1 --- tools/multi_nodes_gate/airship_gate/lib/config.sh | 2 ++ tools/multi_nodes_gate/airship_gate/stages/pegleg-collect.sh | 2 ++ tools/multi_nodes_gate/airship_gate/stages/pegleg-render.sh | 2 ++ 3 files changed, 6 insertions(+) diff --git a/tools/multi_nodes_gate/airship_gate/lib/config.sh b/tools/multi_nodes_gate/airship_gate/lib/config.sh index add33a8f..6e5b8d16 100644 --- a/tools/multi_nodes_gate/airship_gate/lib/config.sh +++ b/tools/multi_nodes_gate/airship_gate/lib/config.sh @@ -27,6 +27,8 @@ 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} +export PEGLEG_PASSPHRASE=${PEGLEG_PASSPHRASE:-ewd?egnPWL0Q?hzzGwEBmII5} +export PEGLEG_SALT=${PEGLEG_SALT:-9EX&uapdz1ka17WOQMG-FjTA} # 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/pegleg-collect.sh b/tools/multi_nodes_gate/airship_gate/stages/pegleg-collect.sh index f95cd4a2..e5488b17 100755 --- a/tools/multi_nodes_gate/airship_gate/stages/pegleg-collect.sh +++ b/tools/multi_nodes_gate/airship_gate/stages/pegleg-collect.sh @@ -69,6 +69,8 @@ collect_design_docs() { -v "${HOME}/.ssh":/root/.ssh \ -v "${REPO_ROOT}":/workspace \ -v "${DEFINITION_DEPOT}":/collect \ + -e "PEGLEG_PASSPHRASE=$PEGLEG_PASSPHRASE" \ + -e "PEGLEG_SALT=$PEGLEG_SALT" \ "${IMAGE_PEGLEG_CLI}" \ $(render_pegleg_cli) } diff --git a/tools/multi_nodes_gate/airship_gate/stages/pegleg-render.sh b/tools/multi_nodes_gate/airship_gate/stages/pegleg-render.sh index 283a7ce4..6b5cfe61 100755 --- a/tools/multi_nodes_gate/airship_gate/stages/pegleg-render.sh +++ b/tools/multi_nodes_gate/airship_gate/stages/pegleg-render.sh @@ -69,6 +69,8 @@ collect_rendered_doc() { -v "${HOME}/.ssh":/root/.ssh \ -v "${REPO_ROOT}":/workspace \ -v "${RENDERED_DEPOT}":/collect \ + -e "PEGLEG_PASSPHRASE=$PEGLEG_PASSPHRASE" \ + -e "PEGLEG_SALT=$PEGLEG_SALT" \ "${IMAGE_PEGLEG_CLI}" \ $(render_pegleg_cli) }