Merge lp:~pguimaraes/charms/trusty/memcached/trunk into lp:charms/trusty/memcached

[Pedro Guimarães]

Adding public-address to grant_access on firewall policy
fixes: lp:1796269

Unmerged revisions

79. By Pedro Guimarães on 2018-10-05

Adding public-address to grant_access on firewall policy

=== modified file 'hooks/memcached_hooks.py'
--- hooks/memcached_hooks.py	2017-05-05 10:30:16 +0000
+++ hooks/memcached_hooks.py	2018-10-05 11:51:42 +0000
@@ -168,13 +168,21 @@
         log('Granting memcached access to {}'.format(addr), level='INFO')
         grant_access(addr)
 
+    public_addr = relation_get('public-address')
+    if public_addr:
+        log('Granting mem cached access to public address {}'.format(public_addr), level='INFO')
+        grant_access(public_addr)
+
 
 @hooks.hook('cache-relation-departed')
 def cache_relation_departed():
     addr = relation_get('private-address')
     log('Revoking memcached access to {}'.format(addr))
     revoke_access(addr)
-
+    public_addr = relation_get('public-address')
+    if public_addr:
+        log('Revoking memcached access to public address {}'.format(public_addr))
+        revoke_access(public_addr)
 
 @hooks.hook('config-changed')
 @restart_on_change(RESTART_MAP)