Merge lp:~james-page/charms/precise/openstack-dashboard/fixup-decode into lp:~charmers/charms/precise/openstack-dashboard/trunk

[James Page]

Ensure ca_cert is decoded before writing to disk.

Otherwise dashboard can't access keystone signed SSL services.

[Jonathan Davies (jpds)]

This just worked for me.

[Marco Ceppi (marcoceppi)]

Deferring to openstack-charmers

review: Abstain

[Jonathan Davies (jpds)]

+1.

review: Approve

[Ante Karamatić (ivoks)]

review: Approve

[Ante Karamatić (ivoks)]

Is 0o600 a typo?

[James Page (james-page)]

No - its fine

=== modified file 'hooks/horizon_hooks.py'
--- hooks/horizon_hooks.py	2013-09-27 16:07:33 +0000
+++ hooks/horizon_hooks.py	2014-01-22 10:38:37 +0000
@@ -34,6 +34,7 @@
 from charmhelpers.contrib.hahelpers.apache import install_ca_cert
 from charmhelpers.contrib.hahelpers.cluster import get_hacluster_config
 from charmhelpers.payload.execd import execd_preinstall
+from base64 import b64decode
 
 hooks = Hooks()
 CONFIGS = register_configs()
@@ -95,7 +96,7 @@
 def keystone_changed():
     CONFIGS.write(LOCAL_SETTINGS)
     if relation_get('ca_cert'):
-        install_ca_cert(relation_get('ca_cert'))
+        install_ca_cert(b64decode(relation_get('ca_cert')))
 
 
 @hooks.hook('cluster-relation-departed',

=== modified file 'unit_tests/test_horizon_contexts.py'
--- unit_tests/test_horizon_contexts.py	2013-09-27 14:39:31 +0000
+++ unit_tests/test_horizon_contexts.py	2014-01-22 10:38:37 +0000
@@ -40,6 +40,7 @@
 
 
 class TestHorizonContexts(CharmTestCase):
+
     def setUp(self):
         super(TestHorizonContexts, self).setUp(horizon_contexts, TO_PATCH)
         self.config.side_effect = self.test_config.get
@@ -67,7 +68,7 @@
                 call('key')
             ])
         # Security check on key permissions
-        _chmod.assert_called_with('/etc/ssl/private/dashboard.key', 0600)
+        _chmod.assert_called_with('/etc/ssl/private/dashboard.key', 0o600)
 
     def test_ApacheSSLContext_disabled(self):
         self.get_cert.return_value = (None, None)

=== modified file 'unit_tests/test_horizon_hooks.py'
--- unit_tests/test_horizon_hooks.py	2013-10-15 14:11:27 +0000
+++ unit_tests/test_horizon_hooks.py	2014-01-22 10:38:37 +0000
@@ -27,7 +27,12 @@
     'install_ca_cert',
     'unit_get',
     'log',
-    'execd_preinstall']
+    'execd_preinstall',
+    'b64decode']
+
+
+def passthrough(value):
+    return value
 
 
 class TestHorizonHooks(CharmTestCase):
@@ -35,6 +40,7 @@
     def setUp(self):
         super(TestHorizonHooks, self).setUp(hooks, TO_PATCH)
         self.config.side_effect = self.test_config.get
+        self.b64decode.side_effect = passthrough
 
     def _call_hook(self, hookname):
         hooks.hooks.execute([

=== modified file 'unit_tests/test_horizon_utils.py'
--- unit_tests/test_horizon_utils.py	2013-09-25 15:49:51 +0000
+++ unit_tests/test_horizon_utils.py	2014-01-22 10:38:37 +0000
@@ -20,6 +20,7 @@
 
 
 class TestHorizonUtils(CharmTestCase):
+
     def setUp(self):
         super(TestHorizonUtils, self).setUp(horizon_utils, TO_PATCH)
 

=== modified file 'unit_tests/test_utils.py'
--- unit_tests/test_utils.py	2013-07-18 08:37:37 +0000
+++ unit_tests/test_utils.py	2014-01-22 10:38:37 +0000
@@ -44,6 +44,7 @@
 
 
 class CharmTestCase(unittest.TestCase):
+
     def setUp(self, obj, patches):
         super(CharmTestCase, self).setUp()
         self.patches = patches
@@ -64,6 +65,7 @@
 
 
 class TestConfig(object):
+
     def __init__(self):
         self.config = get_default_config()
 
@@ -83,6 +85,7 @@
 
 
 class TestRelation(object):
+
     def __init__(self, relation_data={}):
         self.relation_data = relation_data