summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhihui wu <wu.zhihui1@zte.com.cn>2016-11-08 08:54:18 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-08 08:54:18 +0000
commit3dff5b4dc848147235120f7befd5b5de29461846 (patch)
treeaddcfe8851d6ae9616bb35cf477becd0f79e800c
parenta59b5ea6fa221538ae84013a76ae2ae9de85ad44 (diff)
parent773abe961b1f4e5a8eb76058f90c628b66b1ad4b (diff)
Merge "Move a process file ips.log to /home/opnfv/qtip/"
-rw-r--r--func/env_setup.py3
-rwxr-xr-xscripts/fetch_compute_ips.sh2
2 files changed, 2 insertions, 3 deletions
diff --git a/func/env_setup.py b/func/env_setup.py
index 6027f904..e9f9cd2a 100644
--- a/func/env_setup.py
+++ b/func/env_setup.py
@@ -113,8 +113,7 @@ class Env_setup:
(installer_type, installer_ip)
logger.info(cmd)
os.system(cmd)
- home = expanduser("~")
- with open(home + "/ips.log", "r") as file:
+ with open(expanduser('~') + "/qtip/ips.log", "r") as file:
data = file.read()
if data:
ips.extend(data.rstrip('\n').split('\n'))
diff --git a/scripts/fetch_compute_ips.sh b/scripts/fetch_compute_ips.sh
index ebe817a6..4bdc9a48 100755
--- a/scripts/fetch_compute_ips.sh
+++ b/scripts/fetch_compute_ips.sh
@@ -110,7 +110,7 @@ if [ -z "$IPS" ]; then
else
echo "-------- all compute node ips: --------"
touch $HOME/ips.log
- echo "$IPS" > $HOME/ips.log
+ echo "$IPS" > $HOME/qtip/ips.log
echo $IPS
fi