Merge ~jjo/layer-snap:jjo-trusty-snap_nopes into ~stub/layer-snap:master

[JuanJo Ciarlante]

[Stuart Bishop (stub)]

The snap layer supports trusty.

What is the problem you are trying to fix?

review: Disapprove

[JuanJo Ciarlante (jjo)]

Thanks for the review - seems that the unit I was installing this had
a bad sysv-rc dependency tree, voiding snapd from being installed.
Disregarding this MP.

Unmerged commits

29d94b6... by JuanJo Ciarlante on 2017-03-06

[jjo] skip snap register on trusty

diff --git a/reactive/snap.py b/reactive/snap.py
index d357e05..db730bf 100644
--- a/reactive/snap.py
+++ b/reactive/snap.py
@@ -114,6 +114,15 @@ def ensure_path():
         os.environ['PATH'] += ':/snap/bin'
 
 
+def snap_register():
+    if get_series() == 'trusty':
+        return
+    hookenv.atstart(hookenv.log, 'Initializing Snap Layer')
+    hookenv.atstart(ensure_snapd)
+    hookenv.atstart(ensure_path)
+    hookenv.atstart(update_snap_proxy)
+    hookenv.atstart(install)
+
 # Per https://github.com/juju-solutions/charms.reactive/issues/33,
 # this module may be imported multiple times so ensure the
 # initialization hook is only registered once. I have to piggy back
@@ -125,9 +134,5 @@ if not hasattr(reactive, '_snap_registered'):
     # do this, then the config in the hook environment may show updates
     # to running hooks well before the config-changed hook has been invoked
     # and the intialization provided an opertunity to be run.
-    hookenv.atstart(hookenv.log, 'Initializing Snap Layer')
-    hookenv.atstart(ensure_snapd)
-    hookenv.atstart(ensure_path)
-    hookenv.atstart(update_snap_proxy)
-    hookenv.atstart(install)
+    snap_register()
     reactive._snap_registered = True