Merge lp:~thomir-deactivatedaccount/charms/trusty/postgresql/fix-for-lxc into lp:charms/trusty/postgresql

[Thomi Richards]

Make the postgres charm installable on lxc / juju local provider.

Make the postgres charm installable on lxc / juju local provider.

[Stuart Bishop (stub)]

I need to leave this until the rewrite branch lands, which has unfortunately been waiting for review for a couple of weeks. I suspect it won't be needed, as the rewrite using charmhelpers.core.sysctl and error handling can be done there.

lp:~stub/charms/trusty/postgresql/rewrite if you want to test the rework.

review: Disapprove

Unmerged revisions

130. By Thomi Richards on 2015-09-16

Make postgres charm work for lxc provider.

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-08-07 16:14:56 +0000
+++ hooks/hooks.py	2015-09-16 00:54:02 +0000
@@ -387,7 +387,15 @@
 def _run_sysctl(postgresql_sysctl):
     """sysctl -p postgresql_sysctl, helper for easy test mocking."""
     # Do not error out when this fails. It is not likely to work under LXC.
-    return run("sysctl -p {}".format(postgresql_sysctl), exit_on_error=False)
+    # exit_on_error only controls whether sys.exit is called. An exception
+    # will be raised in all cases.
+    try:
+        return run(
+            "sysctl -p {}".format(postgresql_sysctl),
+            exit_on_error=False
+        )
+    except subprocess.CalledProcessError:
+        return ""
 
 
 def create_postgresql_config(config_file):