Charm Helpers

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

  1. memcache-trusty
  2. Merge into devel
Proposed by Liam Young
Status: Merged
Merged at revision: 666
Proposed branch: lp:~gnuoy/charm-helpers/memcache-trusty
Merge into: lp:charm-helpers
Diff against target: 44 lines (+11/-2)
2 files modified
charmhelpers/contrib/openstack/context.py (+6/-2)
tests/contrib/openstack/test_os_contexts.py (+5/-0)
To merge this branch: bzr merge lp:~gnuoy/charm-helpers/memcache-trusty
Reviewer Review Type Date Requested Status
David Ames (community) Approve
Review via email: mp+312931@code.launchpad.net
To post a comment you must log in.
lp:~gnuoy/charm-helpers/memcache-trusty updated
667. By Liam Young

Fix copy/pasta error

Revision history for this message
David Ames (thedac) wrote :

Looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/openstack/context.py'
2--- charmhelpers/contrib/openstack/context.py 2016-11-29 16:01:56 +0000
3+++ charmhelpers/contrib/openstack/context.py 2016-12-09 16:59:45 +0000
4@@ -1525,11 +1525,15 @@
5 ctxt = {}
6 ctxt['use_memcache'] = enable_memcache(config('openstack-origin'))
7 if ctxt['use_memcache']:
8- ctxt['memcache_server'] = '::1'
9+ # Trusty version of memcached does not support ::1 as a listen
10+ # address so use host file entry instead
11+ if lsb_release()['DISTRIB_CODENAME'].lower() > 'trusty':
12+ ctxt['memcache_server'] = '::1'
13+ else:
14+ ctxt['memcache_server'] = 'ip6-localhost'
15 ctxt['memcache_server_formatted'] = '[::1]'
16 ctxt['memcache_port'] = '11211'
17 ctxt['memcache_url'] = 'inet6:{}:{}'.format(
18 ctxt['memcache_server_formatted'],
19 ctxt['memcache_port'])
20-
21 return ctxt
22
23=== modified file 'tests/contrib/openstack/test_os_contexts.py'
24--- tests/contrib/openstack/test_os_contexts.py 2016-11-29 16:01:56 +0000
25+++ tests/contrib/openstack/test_os_contexts.py 2016-12-09 16:59:45 +0000
26@@ -3005,6 +3005,7 @@
27
28 @patch.object(context, 'enable_memcache')
29 def test_memcache_context(self, _enable_memcache):
30+ self.lsb_release.return_value = {'DISTRIB_CODENAME': 'xenial'}
31 _enable_memcache.return_value = True
32 config = {'openstack-origin': 'distro'}
33 self.config.side_effect = fake_config(config)
34@@ -3017,6 +3018,10 @@
35 'memcache_url': 'inet6:[::1]:11211',
36 'use_memcache': True}
37 self.assertEqual(ctxt(), expect)
38+ self.lsb_release.return_value = {'DISTRIB_CODENAME': 'trusty'}
39+ expect['memcache_server'] = 'ip6-localhost'
40+ ctxt = context.MemcacheContext()
41+ self.assertEqual(ctxt(), expect)
42
43 @patch.object(context, 'enable_memcache')
44 def test_memcache_off_context(self, _enable_memcache):

Subscribers

People subscribed via source and target branches