Merge branch 'master' into ceph

miscellaneous/netcelery@.service

@@ -11,4 +11,5 @@ TimeoutStopSec=600
 Restart=always
 Restart=always
 
 
 WorkingDirectory=/home/cloud/vmdriver
 WorkingDirectory=/home/cloud/vmdriver
-ExecStart=/bin/bash -c "source /etc/profile; workon vmdriver; exec celery -A netcelery worker --loglevel=info -n %H.%I"
+
+ExecStart=/bin/bash -c "source /etc/profile; workon vmdriver; exec celery -A netcelery worker --loglevel=info -n $(/bin/hostname -s).%I"

miscellaneous/vmcelery@.service

@@ -11,4 +11,5 @@ TimeoutStopSec=600
 Restart=always
 Restart=always
 
 
 WorkingDirectory=/home/cloud/vmdriver
 WorkingDirectory=/home/cloud/vmdriver
-ExecStart=/bin/bash -c "source /etc/profile; workon vmdriver; exec celery -A vmcelery worker --loglevel=info -n %H.%I"
+
+ExecStart=/bin/bash -c "source /etc/profile; workon vmdriver; exec celery -A vmcelery worker --loglevel=info -n $(/bin/hostname -s).%I"

vmdriver.py

@@ -650,13 +650,13 @@ def get_driver_version():
     from git import Repo
     from git import Repo
     try:
     try:
         repo = Repo(path=os.getcwd())
         repo = Repo(path=os.getcwd())
-        lc = repo.log()[0]
-        return {'branch': repo.active_branch,
-                'commit': lc.id_abbrev,
+        lc = repo.head.commit
+        return {'branch': repo.active_branch.name,
+                'commit': lc.hexsha,
                 'commit_text': lc.summary,
                 'commit_text': lc.summary,
-                'is_dirty': repo.is_dirty}
-    except:
-        logging.exception("Unhandled exception: ")
+                'is_dirty': repo.is_dirty()}
+    except Exception as e:
+        logging.exception("Unhandled exception: %s", e)
         return None
         return None