commit sha added

nailgun/nailgun/api/handlers/version.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+
+import os
+import web
+import json
+
+from git import Repo
+
+from nailgun.settings import settings
+from nailgun.api.handlers.base import JSONHandler
+
+
+class VersionHandler(JSONHandler):
+
+    def GET(self):
+        web.header('Content-Type', 'application/json')
+        return json.dumps({
+            "sha": str(settings.COMMIT_SHA or "Unknown")
+        })

nailgun/nailgun/api/urls.py

@@ -26,6 +26,8 @@ from nailgun.api.handlers.logs import LogEntryCollectionHandler
 from nailgun.api.handlers.logs import LogSourceCollectionHandler
 from nailgun.api.handlers.logs import LogSourceByNodeCollectionHandler
 
+from nailgun.api.handlers.version import VersionHandler
+
 urls = (
     r'/releases/?$',
     'ReleaseCollectionHandler',
@@ -63,6 +65,8 @@ urls = (
     'LogSourceCollectionHandler',
     r'/logs/sources/nodes/(?P<node_id>\d+)/?$',
     'LogSourceByNodeCollectionHandler',
+    r'/version/?$',
+    'VersionHandler'
 )
 
 api_app = web.application(urls, locals())

nailgun/nailgun/settings.yaml

@@ -214,3 +214,5 @@ DNS_SEARCH: "example.com"
 
 FAKE_TASKS_TICK_INTERVAL: "1"
 FAKE_TASKS_TICK_COUNT: "30"
+
+COMMIT_SHA: ""

puppet/nailgun/manifests/venv.pp

@@ -41,6 +41,7 @@ class nailgun::venv(
   $database_port = "3306"
   $database_user = "nailgun"
   $database_passwd = "nailgun"
+  $commit_sha = ""
 
   file { "/etc/nailgun":
     ensure => directory,

puppet/nailgun/templates/settings.yaml.erb

@@ -59,3 +59,5 @@ PUPPET_VERSION: "2.7.19"
 DNS_DOMAIN: "<%= domain %>"
 DNS_SERVERS: "<%= scope.lookupvar('nailgun::puppet_master_ip') %>"
 DNS_SEARCH: "<%= domain %>"
+
+COMMIT_SHA: "<%= commit_sha %>"

requirements-eggs.txt

@@ -16,4 +16,4 @@ pycrypto	2.6
 simplejson	2.6.2
 web.py	0.37
 wsgilog	0.3
-wsgiref	0.1.2
+wsgiref	0.1.2