From 80b2b33036e3afe41ad0573f9ca7cf6af38cf767 Mon Sep 17 00:00:00 2001
From: Dimitri Mazmanov <dimitri.mazmanov@ericsson.com>
Date: Tue, 31 Jan 2017 14:20:37 +0100
Subject: extract filename

Change-Id: I1393da09fef7ac3650a74c95483736b2c5aaff65
Signed-off-by: Dimitri Mazmanov <dimitri.mazmanov@ericsson.com>
---
 tools/keystone/endpoint.sh | 2 +-
 tools/keystone/run.sh      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'tools/keystone')

diff --git a/tools/keystone/endpoint.sh b/tools/keystone/endpoint.sh
index aae851d..dd2aeae 100755
--- a/tools/keystone/endpoint.sh
+++ b/tools/keystone/endpoint.sh
@@ -24,7 +24,7 @@ ENDPOINT_PUBLIC_URL=$(openstack endpoint list | grep keystone | grep public | cu
 ENDPOINT_ADMIN_URL=$(openstack endpoint list | grep keystone | grep admin | cut -d '|' -f 8 | cut -d '/' -f 3 | cut -d ':' -f 1)
 ENDPOINT_INTERNAL_URL=$(openstack endpoint list | grep keystone | grep internal | cut -d '|' -f 8 | cut -d '/' -f 3 | cut -d ':' -f 1)
 
-cat <<EOT >> ${ENDPOINT_FILE}
+cat > ${ENDPOINT_FILE} <<EOT
 [DEFAULT]
 public_url=${ENDPOINT_PUBLIC_URL}
 admin_url=${ENDPOINT_ADMIN_URL}
diff --git a/tools/keystone/run.sh b/tools/keystone/run.sh
index 6ece634..11c6773 100755
--- a/tools/keystone/run.sh
+++ b/tools/keystone/run.sh
@@ -79,8 +79,9 @@ function run_on_target() {
     "ssh $ssh_options $1 \"cd /root/  && cat > ${runnable}\"" < ${runnable} &> /dev/null
     if [ -n "${data}" ]; then
         # Copy any accompanying data along with the script
+        fname=$(basename ${data})
         sshpass -p r00tme ssh 2>/dev/null $ssh_options root@${installer_ip} \
-        "ssh $ssh_options $1 \"cd /root/  && cat > $(basename ${data})\"" < ${data} &> /dev/null
+        "ssh $ssh_options $1 \"cd /root/  && cat > ${fname}\"" < ${data} &> /dev/null
     fi
     # Set the rights and execute
     sshpass -p r00tme ssh 2>/dev/null $ssh_options root@${installer_ip} \
-- 
cgit 1.2.3-korg