summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-12-08 10:24:57 -0800
committerGitHub <noreply@github.com>2017-12-08 10:24:57 -0800
commitb601aa0ce8e7458ee795a7dff7321c70a9b2fcc7 (patch)
treefa9fc14223f964f436fad6b4b27824ff27bf96ce
parent8b484281b6052b82869da8cc691e427ec9e1a0fc (diff)
parentf6fd3a10c522d807b1a01da1963e1b7558e0333b (diff)
downloadopenshift-b601aa0ce8e7458ee795a7dff7321c70a9b2fcc7.tar.gz
openshift-b601aa0ce8e7458ee795a7dff7321c70a9b2fcc7.tar.bz2
openshift-b601aa0ce8e7458ee795a7dff7321c70a9b2fcc7.tar.xz
openshift-b601aa0ce8e7458ee795a7dff7321c70a9b2fcc7.zip
Merge pull request #6320 from dgoodwin/containerized-inventory-symlink
Automatic merge from submit-queue. Fix inventory symlinks in origin-ansible container. When attempting to run openshift-ansible in a kubernetes pod, we attempted to use a configmap to mount in our inventory to run against. However kubernetes mounts configmaps/secrets volumes through the use of relative symlinks. The use of "cp -a" in this script then copies a relative symlink to /tmp which is now dangling, and ansible will fail to run. This patch changes to just copy the file regularly resulting in a value temp file that is not a symlink.
-rwxr-xr-ximages/installer/root/usr/local/bin/run2
1 files changed, 1 insertions, 1 deletions
diff --git a/images/installer/root/usr/local/bin/run b/images/installer/root/usr/local/bin/run
index cd38a6ff0..67cf7dfde 100755
--- a/images/installer/root/usr/local/bin/run
+++ b/images/installer/root/usr/local/bin/run
@@ -18,7 +18,7 @@ INVENTORY="$(mktemp)"
if [[ -v INVENTORY_FILE ]]; then
# Make a copy so that ALLOW_ANSIBLE_CONNECTION_LOCAL below
# does not attempt to modify the original
- cp -a ${INVENTORY_FILE} ${INVENTORY}
+ cp ${INVENTORY_FILE} ${INVENTORY}
elif [[ -v INVENTORY_DIR ]]; then
INVENTORY="$(mktemp -d)"
cp -R ${INVENTORY_DIR}/* ${INVENTORY}