Merge lp:~gnuoy/charm-helpers/memcache-trusty into lp:charm-helpers

[Liam Young]

[lp:~gnuoy/charm-helpers/memcache-trusty]

667. By Liam Young on 2016-12-09

Fix copy/pasta error

[David Ames (thedac)]

Looks good to me.

review: Approve

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2016-11-29 16:01:56 +0000
+++ charmhelpers/contrib/openstack/context.py	2016-12-09 16:59:45 +0000
@@ -1525,11 +1525,15 @@
         ctxt = {}
         ctxt['use_memcache'] = enable_memcache(config('openstack-origin'))
         if ctxt['use_memcache']:
-            ctxt['memcache_server'] = '::1'
+            # Trusty version of memcached does not support ::1 as a listen
+            # address so use host file entry instead
+            if lsb_release()['DISTRIB_CODENAME'].lower() > 'trusty':
+                ctxt['memcache_server'] = '::1'
+            else:
+                ctxt['memcache_server'] = 'ip6-localhost'
             ctxt['memcache_server_formatted'] = '[::1]'
             ctxt['memcache_port'] = '11211'
             ctxt['memcache_url'] = 'inet6:{}:{}'.format(
                 ctxt['memcache_server_formatted'],
                 ctxt['memcache_port'])
-
         return ctxt
 
=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2016-11-29 16:01:56 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2016-12-09 16:59:45 +0000
@@ -3005,6 +3005,7 @@
 
     @patch.object(context, 'enable_memcache')
     def test_memcache_context(self, _enable_memcache):
+        self.lsb_release.return_value = {'DISTRIB_CODENAME': 'xenial'}
         _enable_memcache.return_value = True
         config = {'openstack-origin': 'distro'}
         self.config.side_effect = fake_config(config)
@@ -3017,6 +3018,10 @@
             'memcache_url': 'inet6:[::1]:11211',
             'use_memcache': True}
         self.assertEqual(ctxt(), expect)
+        self.lsb_release.return_value = {'DISTRIB_CODENAME': 'trusty'}
+        expect['memcache_server'] = 'ip6-localhost'
+        ctxt = context.MemcacheContext()
+        self.assertEqual(ctxt(), expect)
 
     @patch.object(context, 'enable_memcache')
     def test_memcache_off_context(self, _enable_memcache):