Save answer file using shutil.copyfile

apporc · apporc · commit eeeee462f5d2 · 2014-09-19T14:32:15.000+08:00
Signed-off-by: apporc &lt;appleorchard2000@gmail.com&gt;
diff --git a/es_setup/cfg.py b/es_setup/cfg.py
@@ -4,6 +4,8 @@
 import getpass
 import commands
 import os
+import shutil
+from os.path import expanduser
 
 LOG = logging.getLogger(__name__)
 
@@ -330,10 +332,10 @@ def cinder_create(user_conf):
                                (user_conf['os_cinder_dev']))
 
     def packstack(user_conf):
-        TMP_ANSWER_FILE = '/tmp/eayunstack.answer'
-        ANSWER_FILE = '.eayunstack.answer'
+        ANSWER_FILE = '/tmp/eayunstack.answer'
+        ANSWER_SAVE = os.path.join(expanduser("~"), '.es-setup.answer')
         # Generate answer file with packstack.
-        (status, out) = commands.getstatusoutput('/usr/bin/packstack --gen-answer-file=%s' % TMP_ANSWER_FILE)
+        (status, out) = commands.getstatusoutput('/usr/bin/packstack --gen-answer-file=%s' % ANSWER_FILE)
         if status != 0:
             LOG.warn(out)
             raise RuntimeError('Failed to generate answer file')
@@ -371,15 +373,12 @@ def packstack(user_conf):
         for option in configs:
             # Update options
             (status, out) = commands.getstatusoutput('/usr/bin/openstack-config --set %s general %s %s'
-                                                     % (TMP_ANSWER_FILE, option, configs[option]))
+                                                     % (ANSWER_FILE, option, configs[option]))
             if status != 0:
                 LOG.warn(out)
                 raise RuntimeError('Failed to update option %s in answer file' % option)
         # Save answer file
-        os.chdir(os.environ['HOME'])
-        if os.path.exists(ANSWER_FILE):
-            os.unlink(ANSWER_FILE)
-        os.link(TMP_ANSWER_FILE, ANSWER_FILE)
+        shutil.copyfile(ANSWER_FILE, ANSWER_SAVE)
         # Invoke packstack, currently not hide the output from packstack.
         LOG.info('Starting openstack deployment')
         os.system('/usr/bin/packstack --answer-file=%s' % ANSWER_FILE)
