Merge lp:~pwlars/charms/trusty/snappy-device-agent/separate-service-dirs into lp:~canonical-hw-cert/charms/trusty/snappy-device-agent/trunk

[Paul Larson]

This will be needed later down the road for hosting things like adb agents that may need to be combined onto a single host system.

[Paul Larson (pwlars)]

Using this right now with snappy x86 generic, and seems to work well.

review: Approve

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-10-05 15:10:06 +0000
+++ hooks/actions.py	2015-10-16 20:46:22 +0000
@@ -7,7 +7,7 @@
 from charmhelpers.core import hookenv
 from charmhelpers.payload import (archive, execd)
 
-SERVICE_NAME = 'snappy-device-agents'
+SERVICE_NAME = hookenv.service_name()
 AGENT_CONFIGFILE = 'spi-agent.conf'
 DEVICE_CONFIGFILE = 'default.yaml'
 REQUIRED_PACKAGES = [
@@ -28,11 +28,15 @@
 
 
 def _service_dir():
-    template = '/srv/{}/{}'
-    return template.format(config['environment'], SERVICE_NAME)
+    # This is dir where the provisioning kit will live after extraction
+    # The tarball needs to extract to snappy-device-agents and we 
+    # extract it from one level up
+    template = '/srv/snappy-device-agents/{}/snappy-device-agents'
+    return template.format(SERVICE_NAME)
 
 
 def _agent_dir():
+    # This is the dir where the SPI Agent will live after extraction
     template = '{}/spi-agent'
     return template.format(_service_dir())
 
 
=== modified file 'hooks/services.py'
--- hooks/services.py	2015-08-14 20:10:33 +0000
+++ hooks/services.py	2015-10-16 20:46:22 +0000
@@ -9,9 +9,11 @@
 
 def manage():
     config = hookenv.config()
+    service_name = hookenv.service_name()
+    config['service_name'] = service_name
     manager = ServiceManager([
         {
-            'service': 'snappy-proposed-selftest-agent',
+            'service': 'snappy-device-agent-{}'.format(service_name),
             'required_data': [config],
             'data_ready': [
                 actions.basenode,
@@ -20,7 +22,7 @@
                 actions.install_python_packages,
                 helpers.render_template(
                     source='upstart.conf',
-                    target='/etc/init/snappy-proposed-selftest-agent.conf'),
+                    target='/etc/init/snappy-device-agent-{}.conf'.format(service_name)),
                 actions.log_start,
             ],
         },
 
=== modified file 'templates/upstart.conf'
--- templates/upstart.conf	2015-08-14 20:10:33 +0000
+++ templates/upstart.conf	2015-10-16 20:46:22 +0000
@@ -11,7 +11,7 @@
 # unless it fails 15 times within 5 seconds
 respawn limit 15 5
 
-env SERVICE_DIR=/srv/{{ environment }}/snappy-device-agents
+env SERVICE_DIR=/srv/snappy-device-agents/{{ service_name }}/snappy-device-agents
 env SERVICE_USER=ubuntu
 
 script