Merge lp:~fginther/charms/trusty/adt-result-checker/add-basenode into lp:~canonical-ci-engineering/charms/trusty/adt-result-checker/trunk

[Francis Ginther]

Add basenode support and directory layout per IS guidelines.

Add basenode support and directory layout per IS guidelines.

[Celso Providelo (cprov)]

review: Approve

[Francis Ginther (fginther)]

Tested with spec in progress here: lp:~fginther/canonical-mojo-specs/a-r-c-basenode-ksplice-ls

=== modified file 'config.yaml'
--- config.yaml	2015-03-16 17:36:07 +0000
+++ config.yaml	2015-03-19 03:48:56 +0000
@@ -1,4 +1,9 @@
 options:
+  environment:
+    type: string
+    default: "production"
+    description: |
+      Environment (devel, staging, production, etc.) that we're running.
   config-file:
     type: string
     description: |

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-03-16 21:14:20 +0000
+++ hooks/actions.py	2015-03-19 03:48:56 +0000
@@ -6,21 +6,26 @@
 from charmhelpers import fetch
 from charmhelpers.core import hookenv
 from charmhelpers.core.host import adduser
-
-from charmhelpers.payload.archive import extract_tarfile
+from charmhelpers.payload import (archive, execd)
 
 
 REQUIRED_PACKAGES = [
     'python-virtualenv', 'python3-dev']
-SERVICE_DIR = '/srv/adt-result-checker'
 
 config = hookenv.config()
 
+SERVICE_DIR = '/srv/{}/adt-result-checker'.format(config['environment'])
+
 
 def log_start(service_name):
     hookenv.log('adt-result-checker starting')
 
 
+def basenode(service_name):
+    hookenv.log("Executing basenode")
+    execd.execd_preinstall()
+
+
 def install_packages(service_name):
     hookenv.log('Installing dependencies...')
     fetch.add_source('ppa:canonical-ci-engineering/ci-airline-phase-0')
@@ -33,7 +38,7 @@
     tarball = os.path.join(files_dir, 'adt-result-checker.tgz')
     if not os.path.exists(SERVICE_DIR):
         hookenv.log('Installing the code for the first time from tarball')
-        extract_tarfile(tarball, '/srv/')
+        archive.extract_tarfile(tarball, os.path.dirname(SERVICE_DIR))
 
 
 def get_config_file(service_name):

=== modified file 'hooks/services.py'
--- hooks/services.py	2015-03-16 17:36:07 +0000
+++ hooks/services.py	2015-03-19 03:48:56 +0000
@@ -14,6 +14,7 @@
             'service': 'adt-result-checker',
             'required_data': [config],
             'data_ready': [
+                actions.basenode,
                 actions.install_packages,
                 actions.get_result_checker_from_tarball,
                 actions.install_python_packages,

=== modified file 'templates/upstart.conf'
--- templates/upstart.conf	2015-03-16 21:14:20 +0000
+++ templates/upstart.conf	2015-03-19 03:48:56 +0000
@@ -11,7 +11,7 @@
 # unless it fails 15 times within 5 seconds
 respawn limit 15 5
 
-env SERVICE_DIR=/srv/adt-result-checker
+env SERVICE_DIR=/srv/{{ environment }}/adt-result-checker
 
 script