From 520c697daf263cddaa8c16fffd2a0d00323d006f Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 10 Oct 2020 10:22:46 +0200 Subject: [PATCH] add missing condition --- CHANGELOG.md | 7 ++----- overlay/bin/molecule | 7 ++++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 664533c..553c616 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,2 @@ -- ENHANCEMENT - - Add env variable `MOLECULE_ANSIBLE_VAULT_PASSWORD`. - If the variable is set, the value is written to - `ANSIBLE_VAULT_PASSWORD_FILE=/root/.vaultpasswd and - passed to molecule. +- BUGFIX + - add missing condition for `MOLECULE_ANSIBLE_VAULT_PASSWORD` diff --git a/overlay/bin/molecule b/overlay/bin/molecule index 22b9e86..0f42c5d 100755 --- a/overlay/bin/molecule +++ b/overlay/bin/molecule @@ -22,7 +22,8 @@ if [ -n "${MOLECULE_CUSTOM_FILTERS_REPO}" ]; then git clone "$MOLECULE_CUSTOM_FILTERS_REPO" "$WORKDIR" 2> /dev/null fi -touch /root/.vaultpasswd -echo "${MOLECULE_ANSIBLE_VAULT_PASSWORD}" > /root/.vaultpasswd +if [ -n "${MOLECULE_ANSIBLE_VAULT_PASSWORD}" ]; then + echo "${MOLECULE_ANSIBLE_VAULT_PASSWORD}" > /root/.vaultpasswd +fi -exec env ANSIBLE_VAULT_PASSWORD_FILE=/root/.vaultpasswd /usr/local/bin/molecule "$@" +exec env ANSIBLE_VAULT_PASSWORD_FILE="${MOLECULE_ANSIBLE_VAULT_PASSWORD}" /usr/local/bin/molecule "$@"