Juju Charms Collection
swift-proxy package

Merge lp:~hopem/charms/trusty/swift-proxy/charm-helpers-sync-precise-ipv6-haproxy into lp:~openstack-charmers-archive/charms/trusty/swift-proxy/next

  1. Trusty Tahr (14.04)
  2. charm-helpers-sync-precise-ipv6-haproxy
  3. Merge into next
Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 74
Proposed branch: lp:~hopem/charms/trusty/swift-proxy/charm-helpers-sync-precise-ipv6-haproxy
Merge into: lp:~openstack-charmers-archive/charms/trusty/swift-proxy/next
Diff against target: 47 lines (+11/-2)
3 files modified
hooks/charmhelpers/contrib/openstack/context.py (+1/-0)
hooks/charmhelpers/contrib/openstack/neutron.py (+8/-2)
hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+2/-0)
To merge this branch: bzr merge lp:~hopem/charms/trusty/swift-proxy/charm-helpers-sync-precise-ipv6-haproxy
Reviewer Review Type Date Requested Status
Ryan Beisner (community) Approve
Liam Young (community) Approve
Review via email: mp+245219@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Liam Young (gnuoy) wrote :

Approve

review: Approve
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #317 swift-proxy-next for hopem mp245219
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/317/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #346 swift-proxy-next for hopem mp245219
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/346/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #479 swift-proxy-next for hopem mp245219
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/479/

Revision history for this message
Ryan Beisner (1chb1n) wrote :

confirmed a-ok on p-i, t-i, t-j, u-j. thank you, all!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
2--- hooks/charmhelpers/contrib/openstack/context.py 2014-12-16 17:03:09 +0000
3+++ hooks/charmhelpers/contrib/openstack/context.py 2014-12-19 17:35:32 +0000
4@@ -491,6 +491,7 @@
5 ctxt['haproxy_client_timeout'] = config('haproxy-client-timeout')
6
7 if config('prefer-ipv6'):
8+ ctxt['ipv6'] = True
9 ctxt['local_host'] = 'ip6-localhost'
10 ctxt['haproxy_host'] = '::'
11 ctxt['stat_port'] = ':::8888'
12
13=== modified file 'hooks/charmhelpers/contrib/openstack/neutron.py'
14--- hooks/charmhelpers/contrib/openstack/neutron.py 2014-12-16 17:03:09 +0000
15+++ hooks/charmhelpers/contrib/openstack/neutron.py 2014-12-19 17:35:32 +0000
16@@ -152,9 +152,15 @@
17 database=config('neutron-database'),
18 relation_prefix='neutron',
19 ssl_dir=NEUTRON_CONF_DIR)],
20- 'services': ['calico-compute', 'bird', 'neutron-dhcp-agent'],
21+ 'services': ['calico-felix',
22+ 'bird',
23+ 'neutron-dhcp-agent',
24+ 'nova-api-metadata'],
25 'packages': [[headers_package()] + determine_dkms_package(),
26- ['calico-compute', 'bird', 'neutron-dhcp-agent']],
27+ ['calico-compute',
28+ 'bird',
29+ 'neutron-dhcp-agent',
30+ 'nova-api-metadata']],
31 'server_packages': ['neutron-server', 'calico-control'],
32 'server_services': ['neutron-server']
33 }
34
35=== modified file 'hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg'
36--- hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg 2014-12-16 17:03:09 +0000
37+++ hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg 2014-12-19 17:35:32 +0000
38@@ -38,7 +38,9 @@
39 {% for service, ports in service_ports.items() -%}
40 frontend tcp-in_{{ service }}
41 bind *:{{ ports[0] }}
42+ {% if ipv6 -%}
43 bind :::{{ ports[0] }}
44+ {% endif -%}
45 {% for frontend in frontends -%}
46 acl net_{{ frontend }} dst {{ frontends[frontend]['network'] }}
47 use_backend {{ service }}_{{ frontend }} if net_{{ frontend }}

Subscribers

People subscribed via source and target branches