← Back to branch summary

~charmers/charms/trusty/redis/trunk

« back to all changes in this revision

Viewing changes to hooks/relations.py

  • Committer: Francesco Banconi
  • Date: 2015-05-27 15:47:01 UTC
  • mfrom: (2.1.16 handle-ports)
  • Revision ID: francesco.banconi@canonical.com-20150527154701-3gc4399ht2wl8sgp
Handle service ports + other fixes.

Open/close the redis ports.
Add the timeout, tcp-keepalive and databases options.
Make the Redis service listen on the unit private address.
Install charmhelpers from a local tarball rather than PyPI.

QA: make ftest

R=martin.hilton, jay.wren
CC=
https://codereview.appspot.com/243730043

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/relations.py
22
22
        """Return data to be relation_set for this interface."""
23
23
        config = hookenv.config()
24
24
        return {
25
 
            'hostname': hookenv.unit_get('public-address'),
 
25
            'hostname': hookenv.unit_private_ip(),
26
26
            'port': config['port'],
27
27
            'password': config['password'].strip(),
28
28
        }