Merge lp:~hopem/charm-helpers/add-rbd-cache-config-support into lp:charm-helpers

[Edward Hope-Morley]

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'charmhelpers/contrib/openstack/templates/ceph.conf'
--- charmhelpers/contrib/openstack/templates/ceph.conf	2015-06-24 21:26:59 +0000
+++ charmhelpers/contrib/openstack/templates/ceph.conf	2015-07-14 09:18:37 +0000
@@ -13,3 +13,9 @@
 err to syslog = {{ use_syslog }}
 clog to syslog = {{ use_syslog }}
 
+[client]
+{% if rbd_client_cache_settings -%}
+{% for key, value in rbd_client_cache_settings.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{%- endif %}
\ No newline at end of file

=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2015-04-29 12:52:18 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2015-07-14 09:18:37 +0000
@@ -989,9 +989,14 @@
     @patch('os.mkdir')
     @patch.object(context, 'ensure_packages')
     def test_ceph_context_with_data(self, ensure_packages, mkdir, isdir,
-                                    config):
+                                    mock_config):
         '''Test ceph context with all relation data'''
-        config.return_value = True
+        config_dict = {'use-syslog': True}
+
+        def fake_config(key):
+            return config_dict.get(key)
+
+        mock_config.side_effect = fake_config
         isdir.return_value = False
         relation = FakeRelation(relation_data=CEPH_RELATION)
         self.relation_get.side_effect = relation.get
@@ -1031,11 +1036,16 @@
     @patch('os.mkdir')
     @patch.object(context, 'ensure_packages')
     def test_ceph_context_with_public_addr(
-            self, ensure_packages, mkdir, isdir, config):
+            self, ensure_packages, mkdir, isdir, mock_config):
         '''Test ceph context in host with multiple networks with all
         relation data'''
         isdir.return_value = False
-        config.return_value = True
+        config_dict = {'use-syslog': True}
+
+        def fake_config(key):
+            return config_dict.get(key)
+
+        mock_config.side_effect = fake_config
         relation = FakeRelation(relation_data=CEPH_RELATION_WITH_PUBLIC_ADDR)
         self.relation_get.side_effect = relation.get
         self.relation_ids.side_effect = relation.relation_ids
@@ -1053,6 +1063,56 @@
         mkdir.assert_called_with('/etc/ceph')
 
     @patch.object(context, 'config')
+    @patch('os.path.isdir')
+    @patch('os.mkdir')
+    @patch.object(context, 'ensure_packages')
+    def test_ceph_context_with_rbd_cache(self, ensure_packages, mkdir, isdir,
+                                         mock_config):
+        isdir.return_value = False
+        config_dict = {'rbd-client-cache': 'enabled',
+                       'use-syslog': False}
+
+        def fake_config(key):
+            return config_dict.get(key)
+
+        mock_config.side_effect = fake_config
+        relation = FakeRelation(relation_data=CEPH_RELATION_WITH_PUBLIC_ADDR)
+        self.relation_get.side_effect = relation.get
+        self.relation_ids.side_effect = relation.relation_ids
+        self.related_units.side_effect = relation.relation_units
+
+        class CephContextWithRBDCache(context.CephContext):
+            def __call__(self):
+                ctxt = super(CephContextWithRBDCache, self).__call__()
+
+                rbd_cache = fake_config('rbd-client-cache') or ""
+                if rbd_cache.lower() == "enabled":
+                    ctxt['rbd_client_cache_settings'] = \
+                                {'rbd cache': 'true',
+                                 'rbd cache writethrough until flush': 'true'}
+                elif rbd_cache.lower() == "disabled":
+                    ctxt['rbd_client_cache_settings'] = \
+                                    {'rbd cache': 'false'}
+
+                return ctxt
+
+        ceph = CephContextWithRBDCache()
+        result = ceph()
+        expected = {
+            'mon_hosts': '192.168.1.10 192.168.1.11',
+            'auth': 'foo',
+            'key': 'bar',
+            'use_syslog': 'false',
+        }
+        expected['rbd_client_cache_settings'] = \
+            {'rbd cache': 'true',
+             'rbd cache writethrough until flush': 'true'}
+
+        self.assertDictEqual(result, expected)
+        ensure_packages.assert_called_with(['ceph-common'])
+        mkdir.assert_called_with('/etc/ceph')
+
+    @patch.object(context, 'config')
     def test_sysctl_context_with_config(self, config):
         self.charm_name.return_value = 'test-charm'
         config.return_value = '{ kernel.max_pid: "1337"}'
@@ -1080,11 +1140,16 @@
     @patch('os.mkdir')
     @patch.object(context, 'ensure_packages')
     def test_ceph_context_missing_public_addr(
-            self, ensure_packages, mkdir, isdir, config):
+            self, ensure_packages, mkdir, isdir, mock_config):
         '''Test ceph context in host with multiple networks with no
         ceph-public-addr in relation data'''
         isdir.return_value = False
-        config.return_value = True
+        config_dict = {'use-syslog': True}
+
+        def fake_config(key):
+            return config_dict.get(key)
+
+        mock_config.side_effect = fake_config
         relation = deepcopy(CEPH_RELATION_WITH_PUBLIC_ADDR)
         del relation['ceph:0']['ceph/0']['ceph-public-address']
         relation = FakeRelation(relation_data=relation)