Merge lp:~thedac/charm-helpers/dualstack into lp:charm-helpers

Proposed by David Ames on 2017-07-28
Status: Merged
Merged at revision: 781
Proposed branch: lp:~thedac/charm-helpers/dualstack
Merge into: lp:charm-helpers
Diff against target: 37 lines (+0/-4)
3 files modified
charmhelpers/contrib/openstack/context.py (+0/-1)
charmhelpers/contrib/openstack/templates/haproxy.cfg (+0/-2)
tests/contrib/openstack/test_os_contexts.py (+0/-1)
To merge this branch: bzr merge lp:~thedac/charm-helpers/dualstack
Reviewer Review Type Date Requested Status
Billy Olsen 2017-07-28 Approve on 2017-08-11
Review via email: mp+328256@code.launchpad.net

Description of the change

Allow IPv4/IPv6 Dual Stack

Always listen on both IPv4 and IPv6 to allow dual stack connectivity.

To post a comment you must log in.
David Ames (thedac) wrote :

Do not merge until all tests on https://review.openstack.org/#/c/487623/ pass.

David Ames (thedac) wrote :

This is ready. Initial tests have passed on https://review.openstack.org/#/c/487623/ and it is going through a full now.

Billy Olsen (billy-olsen) 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 2017-08-08 22:54:19 +0000
3+++ charmhelpers/contrib/openstack/context.py 2017-08-10 15:38:01 +0000
4@@ -622,7 +622,6 @@
5 ctxt['haproxy_connect_timeout'] = config('haproxy-connect-timeout')
6
7 if config('prefer-ipv6'):
8- ctxt['ipv6'] = True
9 ctxt['local_host'] = 'ip6-localhost'
10 ctxt['haproxy_host'] = '::'
11 else:
12
13=== modified file 'charmhelpers/contrib/openstack/templates/haproxy.cfg'
14--- charmhelpers/contrib/openstack/templates/haproxy.cfg 2017-06-09 16:19:13 +0000
15+++ charmhelpers/contrib/openstack/templates/haproxy.cfg 2017-08-10 15:38:01 +0000
16@@ -48,9 +48,7 @@
17 {% for service, ports in service_ports.items() -%}
18 frontend tcp-in_{{ service }}
19 bind *:{{ ports[0] }}
20- {% if ipv6 -%}
21 bind :::{{ ports[0] }}
22- {% endif -%}
23 {% for frontend in frontends -%}
24 acl net_{{ frontend }} dst {{ frontends[frontend]['network'] }}
25 use_backend {{ service }}_{{ frontend }} if net_{{ frontend }}
26
27=== modified file 'tests/contrib/openstack/test_os_contexts.py'
28--- tests/contrib/openstack/test_os_contexts.py 2017-08-08 22:54:19 +0000
29+++ tests/contrib/openstack/test_os_contexts.py 2017-08-10 15:38:01 +0000
30@@ -1857,7 +1857,6 @@
31 'haproxy_host': '::',
32 'stat_password': 'testpassword',
33 'stat_port': '8888',
34- 'ipv6': True
35 }
36 # the context gets generated.
37 self.assertEquals(ex, result)

Subscribers

People subscribed via source and target branches