summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2017-11-30 12:05:18 -0400
committerDevan Goodwin <dgoodwin@redhat.com>2017-11-30 12:05:18 -0400
commitf6fd3a10c522d807b1a01da1963e1b7558e0333b (patch)
tree40c11ea6156eb727c48548d9e597fee9cddd119e
parent6b6b422245be79dd3eec0c93a58875c646bbfba7 (diff)
downloadopenshift-f6fd3a10c522d807b1a01da1963e1b7558e0333b.tar.gz
openshift-f6fd3a10c522d807b1a01da1963e1b7558e0333b.tar.bz2
openshift-f6fd3a10c522d807b1a01da1963e1b7558e0333b.tar.xz
openshift-f6fd3a10c522d807b1a01da1963e1b7558e0333b.zip
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}