Merge lp:~joetalbott/charms/trusty/adt-cloud-service/add_basenode into lp:~canonical-ci-engineering/charms/trusty/adt-cloud-service/trunk

[Joe Talbott]

Add basenode support.

Add basenode support.

[Francis Ginther (fginther)]

Approve, consistent with https://code.launchpad.net/~fginther/charms/trusty/adt-cloud-worker/add-basenode/+merge/253144 for adding basenode support.

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-03-13 02:42:53 +0000
+++ config.yaml	2015-03-17 21:47:00 +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:47:24 +0000
+++ hooks/actions.py	2015-03-17 21:47:00 +0000
@@ -8,24 +8,31 @@
     host,
 )
 from charmhelpers.core.services import helpers
-from charmhelpers.payload.archive import extract_tarfile
+from charmhelpers.payload import (archive, execd)
 
 
 REQUIRED_PACKAGES = [
     'python-virtualenv', 'python3-dev',
 ]
-SERVICE_DIR = '/srv/adt-cloud-service'
-LOG_DIR = os.path.join(SERVICE_DIR, 'logs')
+
 WSGI_USER = 'www-data'
 WSGI_GROUP = 'www-data'
 
 config = hookenv.config()
 
+SERVICE_DIR = '/srv/{}/adt-cloud-service'.format(config['environment'])
+LOG_DIR = os.path.join(SERVICE_DIR, 'logs')
+
 
 def log_start(service_name):
     hookenv.log('adt-cloud-service 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')
@@ -38,7 +45,7 @@
     tarball = os.path.join(files_dir, 'adt-cloud-service.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):
@@ -70,6 +77,7 @@
     subprocess.check_call(['%s/bin/pip' % env_dir,
                            'install', '--no-deps', '-e', SERVICE_DIR])
 
+
 def prepare_for_wsgi(service_name):
     host.adduser(WSGI_USER)
     host.add_group(WSGI_GROUP)

=== modified file 'hooks/services.py'
--- hooks/services.py	2015-03-16 21:47:24 +0000
+++ hooks/services.py	2015-03-17 21:47:00 +0000
@@ -15,6 +15,7 @@
             'provided_data': [actions.WebsiteRelation()],
             'required_data': [config],
             'data_ready': [
+                actions.basenode,
                 actions.install_packages,
                 actions.get_cloud_service_from_tarball,
                 actions.install_python_packages,

=== modified file 'templates/upstart.conf'
--- templates/upstart.conf	2015-03-13 02:42:53 +0000
+++ templates/upstart.conf	2015-03-17 21:47:00 +0000
@@ -11,7 +11,7 @@
 # unless it fails 15 times within 5 seconds
 respawn limit 15 5
 
-env SERVICE_DIR=/srv/adt-cloud-service
+env SERVICE_DIR=/srv/{{ environment }}/adt-cloud-service
 
 script