Merge lp:~hopem/charms/trusty/nova-cloud-controller/novnc-ssl-stable into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/trunk

[Edward Hope-Morley]

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

charm_lint_check #3112 nova-cloud-controller for hopem mp255445
    LINT OK: passed

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

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

charm_unit_test #2900 nova-cloud-controller for hopem mp255445
    UNIT OK: passed

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

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

charm_amulet_test #2945 nova-cloud-controller for hopem mp255445
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

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

[Billy Olsen (billy-olsen)]

LGTM, Approve

review: Approve

[lp:~hopem/charms/trusty/nova-cloud-controller/novnc-ssl-stable]

143. By Edward Hope-Morley on 2015-04-08

[hopem,r=]

Fixes novnc SSL (ha and single unit)

Backport from /next

Closes-Bug: 1441143

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

charm_lint_check #3156 nova-cloud-controller for hopem mp255445
    LINT OK: passed

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

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

charm_unit_test #2944 nova-cloud-controller for hopem mp255445
    UNIT OK: passed

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

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

charm_amulet_test #2948 nova-cloud-controller for hopem mp255445
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

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

=== modified file 'hooks/nova_cc_context.py'
--- hooks/nova_cc_context.py	2015-01-22 16:00:02 +0000
+++ hooks/nova_cc_context.py	2015-04-08 12:13:57 +0000
@@ -1,3 +1,5 @@
+import os
+
 from charmhelpers.core.hookenv import (
     config,
     relation_ids,
@@ -329,4 +331,22 @@
             servers = []
 
         ctxt['memcached_servers'] = ','.join(servers)
+
+        # Configure nova-novncproxy https if nova-api is using https.
+        if https():
+            cn = resolve_address(endpoint_type=INTERNAL)
+            if cn:
+                cert_filename = 'cert_{}'.format(cn)
+                key_filename = 'key_{}'.format(cn)
+            else:
+                cert_filename = 'cert'
+                key_filename = 'key'
+
+            ssl_dir = '/etc/apache2/ssl/nova'
+            cert = os.path.join(ssl_dir, cert_filename)
+            key = os.path.join(ssl_dir, key_filename)
+            if os.path.exists(cert) and os.path.exists(key):
+                ctxt['ssl_cert'] = cert
+                ctxt['ssl_key'] = key
+
         return ctxt

=== modified file 'templates/icehouse/nova.conf'
--- templates/icehouse/nova.conf	2015-01-07 12:05:04 +0000
+++ templates/icehouse/nova.conf	2015-04-08 12:13:57 +0000
@@ -42,6 +42,8 @@
 memcached_servers = {{ memcached_servers }}
 {% endif %}
 
+{% include "parts/novnc" %}
+
 {% if keystone_ec2_url -%}
 keystone_ec2_url = {{ keystone_ec2_url }}
 {% endif -%}

=== modified file 'templates/kilo/nova.conf'
--- templates/kilo/nova.conf	2015-01-21 09:24:29 +0000
+++ templates/kilo/nova.conf	2015-04-08 12:13:57 +0000
@@ -42,6 +42,8 @@
 memcached_servers = {{ memcached_servers }}
 {% endif %}
 
+{% include "parts/novnc" %}
+
 {% if keystone_ec2_url -%}
 keystone_ec2_url = {{ keystone_ec2_url }}
 {% endif -%}

=== added file 'templates/parts/novnc'
--- templates/parts/novnc	1970-01-01 00:00:00 +0000
+++ templates/parts/novnc	2015-04-08 12:13:57 +0000
@@ -0,0 +1,9 @@
+{%- if ssl_only -%}
+ssl_only=true
+{% endif -%}
+{% if ssl_cert -%}
+cert={{ ssl_cert }}
+{% endif -%}
+{% if ssl_key -%}
+key={{ ssl_key }}
+{% endif %}

=== modified file 'unit_tests/test_nova_cc_contexts.py'
--- unit_tests/test_nova_cc_contexts.py	2015-01-20 09:32:55 +0000
+++ unit_tests/test_nova_cc_contexts.py	2015-04-08 12:13:57 +0000
@@ -47,6 +47,8 @@
         self.config.side_effect = self.test_config.get
         self.log.side_effect = fake_log
 
+    @mock.patch.object(context, 'resolve_address',
+                       lambda *args, **kwargs: None)
     @mock.patch.object(utils, 'os_release')
     @mock.patch('charmhelpers.contrib.network.ip.log')
     def test_instance_console_context_without_memcache(self, os_release, log_):
@@ -57,6 +59,8 @@
         self.assertEqual({'memcached_servers': ''},
                          instance_console())
 
+    @mock.patch.object(context, 'resolve_address',
+                       lambda *args, **kwargs: None)
     @mock.patch.object(utils, 'os_release')
     @mock.patch('charmhelpers.contrib.network.ip.log')
     def test_instance_console_context_with_memcache(self, os_release, log_):
@@ -64,6 +68,8 @@
                                                           '127.0.1.1',
                                                           '127.0.1.1')
 
+    @mock.patch.object(context, 'resolve_address',
+                       lambda *args, **kwargs: None)
     @mock.patch.object(utils, 'os_release')
     @mock.patch('charmhelpers.contrib.network.ip.log')
     def test_instance_console_context_with_memcache_ipv6(self, os_release,