Merge lp:~paulgear/charms/trusty/cassandra/devel into lp:charms/trusty/cassandra

[Paul Gear]

[Paul Gear (paulgear)]

Currently testing; please do not merge yet. This is merely here to easily share diffs against trunk.

[lp:~paulgear/charms/trusty/cassandra/devel]

385. By Paul Gear on 2016-07-01

Revert old version checks and let's just pretend DSE 5.0 == Cassandra 3.0

386. By Paul Gear on 2016-07-01

Remove debug logging now that DSE 5.0 == Cassandra 3.0 is confirmed

[Paul Gear (paulgear)]

This is passing in is-mojo-ci now. Tagging Stuart for review.

[Paul Gear (paulgear)]

To clarify the purpose of this branch, it's to fix the handling of DSE 5.0, and to make it possible to install everything via proxy in an egress-filtered environment (i.e. our CI).

[Stuart Bishop (stub)]

All good, bar a single pedantic point I don't really care about.

review: Approve

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2016-06-09 10:59:24 +0000
+++ hooks/actions.py	2016-07-01 05:04:34 +0000
@@ -133,10 +133,8 @@
 
 @action
 def set_proxy():
-    config = hookenv.config()
-    if config['http_proxy']:
-        os.environ['http_proxy'] = config['http_proxy']
-        os.environ['https_proxy'] = config['http_proxy']
+    import hooks
+    hooks.set_proxy()
 
 
 @action
 
=== modified file 'hooks/helpers.py'
--- hooks/helpers.py	2016-06-09 10:59:24 +0000
+++ hooks/helpers.py	2016-07-01 05:04:34 +0000
@@ -324,6 +324,8 @@
         dse_ver = get_package_version('dse-full')
         if not dse_ver:
             return None
+        elif LooseVersion(dse_ver) >= LooseVersion('5.0'):
+            return '3.0'
         elif LooseVersion(dse_ver) >= LooseVersion('4.7'):
             return '2.1'
         else:
 
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2016-02-26 16:47:03 +0000
+++ hooks/hooks.py	2016-07-01 05:04:34 +0000
@@ -18,12 +18,22 @@
 from charmhelpers.core import hookenv
 
 
+def set_proxy():
+    import os
+    config = hookenv.config()
+    if config['http_proxy']:
+        os.environ['ftp_proxy'] = config['http_proxy']
+        os.environ['http_proxy'] = config['http_proxy']
+        os.environ['https_proxy'] = config['http_proxy']
+
+
 def bootstrap():
     try:
         import bcrypt     # NOQA: flake8
         import cassandra  # NOQA: flake8
     except ImportError:
         packages = ['python3-bcrypt', 'python3-cassandra']
+        set_proxy()
         fetch.configure_sources(update=True)
         fetch.apt_install(packages, fatal=True)
         import bcrypt     # NOQA: flake8