X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=fuel%2Fdeploy%2Fcommon.py;h=2a8c0d149d0b07c5cec1668e9c394be690e1cbbb;hb=563547b4a9f44090f32c0e17d040114854563760;hp=3472e8992e378d8282f4c8cf8541cced3309c7aa;hpb=c92ee8677af0dba1b9f28bc9a97cbf141d60e219;p=genesis.git

diff --git a/fuel/deploy/common.py b/fuel/deploy/common.py
index 3472e89..2a8c0d1 100644
--- a/fuel/deploy/common.py
+++ b/fuel/deploy/common.py
@@ -13,6 +13,7 @@ import os
 import logging
 import argparse
 import shutil
+import stat
 import errno
 
 N = {'id': 0, 'status': 1, 'name': 2, 'cluster': 3, 'ip': 4, 'mac': 5,
@@ -21,7 +22,7 @@ E = {'id': 0, 'status': 1, 'name': 2, 'mode': 3, 'release_id': 4,
      'changes': 5, 'pending_release_id': 6}
 R = {'id': 0, 'name': 1, 'state': 2, 'operating_system': 3, 'version': 4}
 RO = {'name': 0, 'conflicts': 1}
-
+CWD = os.getcwd()
 LOG = logging.getLogger(__name__)
 LOG.setLevel(logging.DEBUG)
 formatter = logging.Formatter('%(message)s')
@@ -31,7 +32,7 @@ LOG.addHandler(out_handler)
 out_handler = logging.FileHandler('autodeploy.log', mode='w')
 out_handler.setFormatter(formatter)
 LOG.addHandler(out_handler)
-
+os.chmod('autodeploy.log', stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)
 
 def exec_cmd(cmd, check=True):
     process = subprocess.Popen(cmd,
@@ -88,11 +89,15 @@ def warn(message):
 
 
 def check_file_exists(file_path):
+    if not os.path.dirname(file_path):
+        file_path = '%s/%s' % (CWD, file_path)
     if not os.path.isfile(file_path):
         err('ERROR: File %s not found\n' % file_path)
 
 
 def check_dir_exists(dir_path):
+    if not os.path.dirname(dir_path):
+        dir_path = '%s/%s' % (CWD, dir_path)
     if not os.path.isdir(dir_path):
         err('ERROR: Directory %s not found\n' % dir_path)
 
@@ -106,7 +111,7 @@ def create_dir_if_not_exists(dir_path):
 def delete(f):
     if os.path.isfile(f):
         log('Deleting file %s' % f)
-        os.remove(file)
+        os.remove(f)
     elif os.path.isdir(f):
         log('Deleting directory %s' % f)
         shutil.rmtree(f)
@@ -135,14 +140,6 @@ class ArgParser(argparse.ArgumentParser):
         sys.exit(2)
 
 
-class literal_unicode(unicode):
-    pass
-
-
-def literal_unicode_representer(dumper, data):
-    return dumper.represent_scalar(u'tag:yaml.org,2002:str', data, style='|')
-
-
 def backup(path):
     src = path
     dst = path + '_orig'