Merge lp:~marcoceppi/charms/trusty/mongodb/trunk into lp:charms/trusty/mongodb

[Marco Ceppi]

Address hooks failing in restricted network

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #15552 mongodb for marcoceppi mp280791
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/15552/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #14512 mongodb for marcoceppi mp280791
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/14512/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #8322 mongodb for marcoceppi mp280791
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/8322/

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-12-16 20:22:02 +0000
+++ hooks/hooks.py	2015-12-17 02:23:58 +0000
@@ -88,14 +88,6 @@
     apt_install("python-lockfile", fatal=True)
     from lockfile import FileLock
 
-try:
-    from charms.benchmark import Benchmark
-except ImportError:
-    apt_install('python-pip', fatal=True)
-    import subprocess
-    subprocess.check_call(['pip', 'install', '-U', 'charms.benchmark'])
-    from charms.benchmark import Benchmark
-
 from charmhelpers.contrib.charmsupport.nrpe import NRPE
 
 hooks = Hooks()
@@ -1117,6 +1109,13 @@
 @hooks.hook('benchmark-relation-changed')
 def benchmark_relation_joined():
     juju_log('benchmark-relation-joined')
+    try:
+        from charms.benchmark import Benchmark
+    except ImportError:
+        apt_install('python-pip', fatal=True)
+        import subprocess
+        subprocess.check_call(['pip', 'install', '-U', 'charms.benchmark'])
+        from charms.benchmark import Benchmark
 
     # Send a list of benchmark-enabled actions for display in the benchmark-gui
     benchmarks = ['perf']