Merge lp:~joetalbott/charms/trusty/adt-image-mapper/fix_service_dir into lp:~canonical-ci-engineering/charms/trusty/adt-image-mapper/trunk

[Joe Talbott]

Get the config before we access the config.

* minor PEP8 fixes as well.

Get the config before we access the config.

* minor PEP8 fixes as well.

[Francis Ginther (fginther)]

Approve

review: Approve

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-03-19 15:46:32 +0000
+++ hooks/actions.py	2015-03-19 16:11:44 +0000
@@ -14,18 +14,20 @@
 REQUIRED_PACKAGES = [
     'python-virtualenv', 'python3-dev', 'libssl-dev', 'libffi-dev',
 ]
+
+config = hookenv.config()
+
 SERVICE_DIR = '/srv/{}/adt-image-mapper'.format(config['environment'])
 LOG_DIR = os.path.join(SERVICE_DIR, 'logs')
 WSGI_USER = 'www-data'
 WSGI_GROUP = 'www-data'
 
-config = hookenv.config()
-
 
 def basenode(service_name):
     hookenv.log("Executing basenode")
     execd.execd_preinstall()
 
+
 def log_start(service_name):
     hookenv.log('adt-image-mapper starting')
 
@@ -74,6 +76,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)