From 943f3d13057e2e0a4e846a8bfbcc7fc9b3973ec3 Mon Sep 17 00:00:00 2001 From: Luke Meyer Date: Fri, 15 Sep 2017 13:10:28 -0400 Subject: system container: use ansible root as cwd --- images/installer/root/exports/config.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'images') diff --git a/images/installer/root/exports/config.json.template b/images/installer/root/exports/config.json.template index 739c0080f..1a009fa7b 100644 --- a/images/installer/root/exports/config.json.template +++ b/images/installer/root/exports/config.json.template @@ -24,7 +24,7 @@ "PLAYBOOK_FILE=$PLAYBOOK_FILE", "ANSIBLE_CONFIG=$ANSIBLE_CONFIG" ], - "cwd": "/opt/app-root/src/", + "cwd": "/usr/share/ansible/openshift-ansible", "rlimits": [ { "type": "RLIMIT_NOFILE", -- cgit v1.2.3 From 8b299f026ceeac66fb7f6565416d860f9abd9f2e Mon Sep 17 00:00:00 2001 From: Luke Meyer Date: Fri, 15 Sep 2017 13:10:48 -0400 Subject: installer image: use tmp file for vaultpass --- images/installer/root/usr/local/bin/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'images') diff --git a/images/installer/root/usr/local/bin/run b/images/installer/root/usr/local/bin/run index 51ac566e5..70aa0bac3 100755 --- a/images/installer/root/usr/local/bin/run +++ b/images/installer/root/usr/local/bin/run @@ -39,7 +39,7 @@ if [[ "$ALLOW_ANSIBLE_CONNECTION_LOCAL" = false ]]; then fi if [[ -v VAULT_PASS ]]; then - VAULT_PASS_FILE=.vaultpass + VAULT_PASS_FILE="$(mktemp)" echo ${VAULT_PASS} > ${VAULT_PASS_FILE} VAULT_PASS_ARG="--vault-password-file ${VAULT_PASS_FILE}" fi -- cgit v1.2.3