Merge lp:~hopem/charms/trusty/ceilometer/fix-apachessl-port-selection into lp:~openstack-charmers-archive/charms/trusty/ceilometer/next

[Edward Hope-Morley]

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

charm_lint_check #654 ceilometer-next for hopem mp246129
    LINT OK: passed

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

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

charm_unit_test #683 ceilometer-next for hopem mp246129
    UNIT OK: passed

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

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

charm_amulet_test #839 ceilometer-next for hopem mp246129
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/9718210/
Build: http://10.245.162.77:8080/job/charm_amulet_test/839/

[Liam Young (gnuoy)]

Approve

review: Approve

[lp:~hopem/charms/trusty/ceilometer/fix-apachessl-port-selection]

64. By Edward Hope-Morley on 2015-01-12

removed stale apache2 templates

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

charm_lint_check #659 ceilometer-next for hopem mp246129
    LINT OK: passed

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

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

charm_unit_test #688 ceilometer-next for hopem mp246129
    UNIT OK: passed

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

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

charm_amulet_test #844 ceilometer-next for hopem mp246129
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/9718343/
Build: http://10.245.162.77:8080/job/charm_amulet_test/844/

=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2014-12-17 18:42:00 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2015-01-12 13:31:54 +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'
@@ -662,8 +663,9 @@
         addresses = self.get_network_addresses()
         for address, endpoint in sorted(set(addresses)):
             for api_port in self.external_ports:
-                ext_port = determine_apache_port(api_port)
-                int_port = determine_api_port(api_port)
+                ext_port = determine_apache_port(api_port,
+                                                 singlenode_mode=True)
+                int_port = determine_api_port(api_port, singlenode_mode=True)
                 portmap = (address, endpoint, int(ext_port), int(int_port))
                 ctxt['endpoints'].append(portmap)
                 ctxt['ext_ports'].append(int(ext_port))

=== modified file 'hooks/charmhelpers/contrib/openstack/neutron.py'
--- hooks/charmhelpers/contrib/openstack/neutron.py	2014-12-17 18:42:00 +0000
+++ hooks/charmhelpers/contrib/openstack/neutron.py	2015-01-12 13:31:54 +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-10-21 20:56:39 +0000
+++ hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg	2015-01-12 13:31:54 +0000
@@ -35,10 +35,12 @@
     stats auth admin:password
 
 {% if frontends -%}
-{% for service, ports in service_ports.iteritems() -%}
+{% 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 }}
@@ -46,7 +48,7 @@
 {% for frontend in frontends -%}
 backend {{ service }}_{{ frontend }}
     balance leastconn
-    {% for unit, address in frontends[frontend]['backends'].iteritems() -%}
+    {% for unit, address in frontends[frontend]['backends'].items() -%}
     server {{ unit }} {{ address }}:{{ ports[1] }} check
     {% endfor %}
 {% endfor -%}

=== removed file 'templates/openstack_https_frontend'
--- templates/openstack_https_frontend	2014-03-05 13:53:56 +0000
+++ templates/openstack_https_frontend	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-{% if endpoints %}
-{% for ext, int in endpoints %}
-Listen {{ ext }}
-NameVirtualHost *:{{ ext }}
-<VirtualHost *:{{ ext }}>
-    ServerName {{ private_address }}
-    SSLEngine on
-    SSLCertificateFile /etc/apache2/ssl/{{ namespace }}/cert
-    SSLCertificateKeyFile /etc/apache2/ssl/{{ namespace }}/key
-    ProxyPass / http://localhost:{{ int }}/
-    ProxyPassReverse / http://localhost:{{ int }}/
-    ProxyPreserveHost on
-</VirtualHost>
-<Proxy *>
-    Order deny,allow
-    Allow from all
-</Proxy>
-<Location />
-    Order allow,deny
-    Allow from all
-</Location>
-{% endfor %}
-{% endif %}