Merge lp:~mbruzek/charms/trusty/mongodb/limited-network into lp:charms/trusty/mongodb

[Matt Bruzek]

An environment that has limited network capability found mongodb charm to be broken because it attempts to install charms.benchmark from pip.

The solution here is to continue to try to install from the Internet, when that fails pip install from a tar file in the charm directory.

[Marco Ceppi (marcoceppi)]

LGTM pending a one line fix

review: Approve

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

charm_lint_check #15550 mongodb for mbruzek mp280784
    LINT OK: passed

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

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

charm_unit_test #14510 mongodb for mbruzek mp280784
    UNIT FAIL: unit-test failed

UNIT Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full unit test output: http://paste.ubuntu.com/14060740/
Build: http://10.245.162.77:8080/job/charm_unit_test/14510/

[Kevin W Monroe (kwmonroe)]

filename needs a fixin, otherwise, +1.

[lp:~mbruzek/charms/trusty/mongodb/limited-network]

83. By Matt Bruzek on 2015-12-17

Moving apt-get install pip outside of try catch!

84. By Matt Bruzek on 2015-12-17

Spelling the resource file name correctly would be helpful.

[Kevin W Monroe (kwmonroe)]

LGTM!

review: Approve

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

charm_lint_check #15551 mongodb for mbruzek mp280784
    LINT OK: passed

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

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

charm_unit_test #14511 mongodb for mbruzek mp280784
    UNIT FAIL: unit-test failed

UNIT Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full unit test output: http://paste.ubuntu.com/14064877/
Build: http://10.245.162.77:8080/job/charm_unit_test/14511/

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

charm_amulet_test #8320 mongodb for mbruzek mp280784
    AMULET OK: passed

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

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

charm_amulet_test #8321 mongodb for mbruzek mp280784
    AMULET OK: passed

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

[Marco Ceppi (marcoceppi)]

Superseded https://code.launchpad.net/~marcoceppi/charms/trusty/mongodb/trunk/+merge/280791

review: Disapprove

Unmerged revisions

84. By Matt Bruzek on 2015-12-17

Spelling the resource file name correctly would be helpful.

83. By Matt Bruzek on 2015-12-17

Moving apt-get install pip outside of try catch!

82. By Matt Bruzek on 2015-12-17

Adding the charms.benchmark file for times when network is limited.

81. By Matt Bruzek on 2015-12-17

In network constrained environments you can not install from the Internet, use a file if all else fails.

=== modified file 'actions/perf'
--- actions/perf	2015-12-02 22:44:28 +0000
+++ actions/perf	2015-12-17 00:49:48 +0000
@@ -11,7 +11,12 @@
     from charms.benchmark import Benchmark
 except ImportError:
     subprocess.check_call(['apt-get', 'install', '-y', 'python-pip'])
-    subprocess.check_call(['pip', 'install', '-U', 'charms.benchmark'])
+    try:
+        subprocess.check_call(['pip', 'install', '-U', 'charms.benchmark'])
+    except:
+        # Using the Internet failed, install charms.benchmark from a file.
+        benchmark_file = 'files/charms.benchmark-1.0.5.tar.gz'
+        subprocess.check_call(['pip', 'install', '-U', benchmark_file])
     from charms.benchmark import Benchmark
 
 

=== added file 'files/charms.benchmark-1.0.5.tar.gz'
Binary files files/charms.benchmark-1.0.5.tar.gz	1970-01-01 00:00:00 +0000 and files/charms.benchmark-1.0.5.tar.gz	2015-12-17 00:49:48 +0000 differ
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-12-16 20:22:02 +0000
+++ hooks/hooks.py	2015-12-17 00:49:48 +0000
@@ -93,7 +93,12 @@
 except ImportError:
     apt_install('python-pip', fatal=True)
     import subprocess
-    subprocess.check_call(['pip', 'install', '-U', 'charms.benchmark'])
+    try:
+        subprocess.check_call(['pip', 'install', '-U', 'charms.benchmark'])
+    except:
+        # Using the Internet failed, install charms.benchmark from a file.
+        benchmark_file = 'files/charms.benchmark-1.0.5.tar.gz'
+        subprocess.check_call(['pip', 'install', '-U', benchmark_file])
     from charms.benchmark import Benchmark
 
 from charmhelpers.contrib.charmsupport.nrpe import NRPE