Merge lp:~ahasenack/charms/precise/postgresql/postgresql-fix-recovery-conf into lp:charms/postgresql

[Andreas Hasenack]

Include streaming_replication when writing out the recovery.conf file so that primary_conninfo gets added to it and replication can work.

Include streaming_replication when writing out the recovery.conf file so that primary_conninfo gets added to it and replication can work.

[Stuart Bishop (stub)]

I've already got this waiting in https://code.launchpad.net/~stub/charms/precise/postgresql/pg93/+merge/202841. I'll land this patch though and resolve conflicts since this bug will block people.

review: Approve

[Stuart Bishop (stub)]

This didn't get picked up earlier, as there was no actual test that data was actually flowing from master to slave. My branch adds a test for this, so no need for one here.

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-01-31 12:12:51 +0000
+++ hooks/hooks.py	2014-02-03 21:14:51 +0000
@@ -628,10 +628,12 @@
         old_recovery_conf = None
 
     charm_dir = hookenv.charm_dir()
+    streaming_replication = hookenv.config('streaming_replication')
     template_file = "{}/templates/recovery.conf.tmpl".format(charm_dir)
     recovery_conf = Template(open(template_file).read()).render({
         'host': master_host,
-        'password': local_state['replication_password']})
+        'password': local_state['replication_password'],
+        'streaming_replication': streaming_replication})
     log(recovery_conf, DEBUG)
     host.write_file(
         os.path.join(postgresql_cluster_dir, 'recovery.conf'),