openstack/charm-nova-cloud-controller
Code Issues Proposed changes

[hopem,r=]

Browse Source 
Fixes novnc SSL (ha and single unit)

Closes-Bug: 1441143
This commit is contained in:
Edward Hope-Morley 2015-04-08 13:10:09 +01:00
parent 70d4f45e2e
commit 5b86b3ae22
6 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hooks/nova_cc_context.py
View File

@ -1,3 +1,5 @@
import os
from charmhelpers.core.hookenv import (
config,
relation_ids,
@ -329,4 +331,22 @@ class InstanceConsoleContext(context.OSContextGenerator):
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

2
templates/icehouse/nova.conf
View File

@ -42,6 +42,8 @@ my_ip = {{ host_ip }}
memcached_servers = {{ memcached_servers }}
{% endif %}
{% include "parts/novnc" %}
{% if keystone_ec2_url -%}
keystone_ec2_url = {{ keystone_ec2_url }}
{% endif -%}

2
templates/juno/nova.conf
View File

@ -42,6 +42,8 @@ my_ip = {{ host_ip }}
memcached_servers = {{ memcached_servers }}
{% endif %}
{% include "parts/novnc" %}
{% if keystone_ec2_url -%}
keystone_ec2_url = {{ keystone_ec2_url }}
{% endif -%}

2
templates/kilo/nova.conf
View File

@ -41,6 +41,8 @@ my_ip = {{ host_ip }}
memcached_servers = {{ memcached_servers }}
{% endif %}
{% include "parts/novnc" %}
{% if keystone_ec2_url -%}
keystone_ec2_url = {{ keystone_ec2_url }}
{% endif -%}

9
templates/parts/novnc Normal file
View File

@ -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 %}

6
unit_tests/test_nova_cc_contexts.py
View File

@ -47,6 +47,8 @@ class NovaComputeContextTests(CharmTestCase):
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 @@ class NovaComputeContextTests(CharmTestCase):
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 @@ class NovaComputeContextTests(CharmTestCase):
'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,