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

[Edward Hope-Morley]

[Liam Young (gnuoy)]

Approve

review: Approve

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #320 nova-cloud-controller-next for hopem mp245223
    LINT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #349 nova-cloud-controller-next for hopem mp245223
    UNIT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #482 nova-cloud-controller-next for hopem mp245223
    AMULET OK: passed

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

[Ryan Beisner (1chb1n)]

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

review: Approve

=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2014-12-15 09:29:56 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2014-12-19 17:35:50 +0000
@@ -491,6 +491,7 @@
             ctxt['haproxy_client_timeout'] = config('haproxy-client-timeout')
 
         if config('prefer-ipv6'):
+            ctxt['ipv6'] = True
             ctxt['local_host'] = 'ip6-localhost'
             ctxt['haproxy_host'] = '::'
             ctxt['stat_port'] = ':::8888'
 
=== modified file 'hooks/charmhelpers/contrib/openstack/neutron.py'
--- hooks/charmhelpers/contrib/openstack/neutron.py	2014-12-10 20:28:55 +0000
+++ hooks/charmhelpers/contrib/openstack/neutron.py	2014-12-19 17:35:50 +0000
@@ -152,9 +152,15 @@
                                         database=config('neutron-database'),
                                         relation_prefix='neutron',
                                         ssl_dir=NEUTRON_CONF_DIR)],
-            'services': ['calico-compute', 'bird', 'neutron-dhcp-agent'],
+            'services': ['calico-felix',
+                         'bird',
+                         'neutron-dhcp-agent',
+                         'nova-api-metadata'],
             'packages': [[headers_package()] + determine_dkms_package(),
-                         ['calico-compute', 'bird', 'neutron-dhcp-agent']],
+                         ['calico-compute',
+                          'bird',
+                          'neutron-dhcp-agent',
+                          'nova-api-metadata']],
             'server_packages': ['neutron-server', 'calico-control'],
             'server_services': ['neutron-server']
         }
 
=== modified file 'hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg'
--- hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg	2014-12-10 20:28:55 +0000
+++ hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg	2014-12-19 17:35:50 +0000
@@ -38,7 +38,9 @@
 {% for service, ports in service_ports.items() -%}
 frontend tcp-in_{{ service }}
     bind *:{{ ports[0] }}
+    {% if ipv6 -%}
     bind :::{{ ports[0] }}
+    {% endif -%}
     {% for frontend in frontends -%}
     acl net_{{ frontend }} dst {{ frontends[frontend]['network'] }}
     use_backend {{ service }}_{{ frontend }} if net_{{ frontend }}