Merge lp:~hopem/charms/trusty/openstack-dashboard/fix-missing-ssl-ca into lp:~openstack-charmers-archive/charms/trusty/openstack-dashboard/next

[Edward Hope-Morley]

[lp:~hopem/charms/trusty/openstack-dashboard/fix-missing-ssl-ca]

59. By Edward Hope-Morley on 2015-04-09

added b64decode

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

charm_lint_check #3190 openstack-dashboard-next for hopem mp255682
    LINT OK: passed

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

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

charm_unit_test #2978 openstack-dashboard-next for hopem mp255682
    UNIT OK: passed

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

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

charm_amulet_test #3000 openstack-dashboard-next for hopem mp255682
    AMULET OK: passed

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

[James Page (james-page)]

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-02-19 04:44:24 +0000
+++ config.yaml	2015-04-09 14:56:10 +0000
@@ -79,6 +79,11 @@
         default:
         description: |
           Base64 encoded SSL key to use with certificate specified as ssl_cert.
+    ssl_ca:
+        type: string
+        default:
+        description: |
+          Base64 encoded certificate authority.
     offline-compression:
         type: string
         default: "yes"
 
=== modified file 'hooks/horizon_contexts.py'
--- hooks/horizon_contexts.py	2015-02-12 09:23:26 +0000
+++ hooks/horizon_contexts.py	2015-04-09 14:56:10 +0000
@@ -14,7 +14,9 @@
     context_complete
 )
 from charmhelpers.contrib.hahelpers.apache import (
-    get_cert
+    get_ca_cert,
+    get_cert,
+    install_ca_cert,
 )
 from charmhelpers.contrib.network.ip import (
     get_ipv6_addr,
@@ -140,6 +142,9 @@
 class ApacheSSLContext(OSContextGenerator):
     def __call__(self):
         ''' Grab cert and key from configuration for SSL config '''
+        ca_cert = get_ca_cert()
+        if ca_cert:
+            install_ca_cert(b64decode(ca_cert))
         (ssl_cert, ssl_key) = get_cert()
         if None not in [ssl_cert, ssl_key]:
             with open('/etc/ssl/certs/dashboard.cert', 'w') as cert_out:
 
=== modified file 'unit_tests/test_horizon_contexts.py'
--- unit_tests/test_horizon_contexts.py	2015-02-12 09:23:26 +0000
+++ unit_tests/test_horizon_contexts.py	2015-04-09 14:56:10 +0000
@@ -50,6 +50,7 @@
         self.assertEquals(horizon_contexts.ApacheContext()(),
                           {'http_port': 70, 'https_port': 433})
 
+    @patch.object(horizon_contexts, 'get_ca_cert', lambda: None)
     @patch('os.chmod')
     def test_ApacheSSLContext_enabled(self, _chmod):
         self.get_cert.return_value = ('cert', 'key')
@@ -70,6 +71,7 @@
         # Security check on key permissions
         _chmod.assert_called_with('/etc/ssl/private/dashboard.key', 0o600)
 
+    @patch.object(horizon_contexts, 'get_ca_cert', lambda: None)
     def test_ApacheSSLContext_disabled(self):
         self.get_cert.return_value = (None, None)
         self.assertEquals(horizon_contexts.ApacheSSLContext()(),