Merge lp:~hopem/charms/trusty/nova-compute/add-rbd-cache-config-support into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[Edward Hope-Morley]

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

charm_lint_check #6295 nova-compute-next for hopem mp264539
    LINT OK: passed

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

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

charm_unit_test #5927 nova-compute-next for hopem mp264539
    UNIT OK: passed

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

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

charm_amulet_test #5150 nova-compute-next for hopem mp264539
    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/11891005/
Build: http://10.245.162.77:8080/job/charm_amulet_test/5150/

[lp:~hopem/charms/trusty/nova-compute/add-rbd-cache-config-support]

146. By Edward Hope-Morley on 2015-07-20

sync trunk

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

charm_lint_check #6504 nova-compute-next for hopem mp264539
    LINT OK: passed

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

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

charm_unit_test #6136 nova-compute-next for hopem mp264539
    UNIT OK: passed

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

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

charm_amulet_test #5226 nova-compute-next for hopem mp264539
    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/11908779/
Build: http://10.245.162.77:8080/job/charm_amulet_test/5226/

[Ryan Beisner (1chb1n)]

FYI - The amulet test failure for 052-basic-trusty-kilo-git is pre-existing and does not appear to be related to this proposal.

=== modified file 'charm-helpers-hooks.yaml'
--- charm-helpers-hooks.yaml	2015-03-31 15:01:48 +0000
+++ charm-helpers-hooks.yaml	2015-07-20 08:38:22 +0000
@@ -1,4 +1,4 @@
-branch: lp:charm-helpers
+branch:  lp:~hopem/charm-helpers/add-rbd-cache-config-support
 destination: hooks/charmhelpers
 include:
     - core

=== modified file 'config.yaml'
--- config.yaml	2015-07-17 08:28:10 +0000
+++ config.yaml	2015-07-20 08:38:22 +0000
@@ -225,6 +225,14 @@
     description: |
       RBD pool to use with Nova libvirt RBDImageBackend. Only required when you
       have libvirt-image-backend set to 'rbd'.
+  rbd-client-cache:
+    type: string
+    default:
+    description: |
+      Enable/disable rbd client cache. Leaving this value unset will result in
+      default Ceph rbd client settings being used (rbd cache is enabled by
+      default for Ceph >= Giant). Supported values here are "enabled" or
+      "disabled".
   ceph-osd-replication-count:
     type: int
     default: 3

=== modified file 'hooks/charmhelpers/contrib/openstack/templates/ceph.conf'
--- hooks/charmhelpers/contrib/openstack/templates/ceph.conf	2015-07-16 20:18:54 +0000
+++ hooks/charmhelpers/contrib/openstack/templates/ceph.conf	2015-07-20 08:38:22 +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 'hooks/nova_compute_context.py'
--- hooks/nova_compute_context.py	2015-07-15 08:27:44 +0000
+++ hooks/nova_compute_context.py	2015-07-20 08:38:22 +0000
@@ -1,5 +1,7 @@
 import uuid
+import os
 import platform
+
 from charmhelpers.contrib.openstack import context
 from charmhelpers.core.host import service_running, service_start
 from charmhelpers.fetch import apt_install, filter_installed_packages
@@ -178,6 +180,23 @@
         elif config('libvirt-image-backend') == 'lvm':
             ctxt['libvirt_images_type'] = 'lvm'
 
+        rbd_cache = config('rbd-client-cache') or ""
+        if rbd_cache.lower() == "enabled":
+            # We use write-though only to be safe for migration
+            ctxt['rbd_client_cache_settings'] = \
+                {'rbd cache': 'true',
+                 'rbd cache size': '64 MiB',
+                 'rbd cache max dirty': '0 MiB',
+                 'rbd cache writethrough until flush': 'true',
+                 'admin socket': '/var/run/ceph/rbd-client-$pid.asok'}
+
+            asok_path = '/var/run/ceph/'
+            if not os.path.isdir(asok_path):
+                os.mkdir(asok_path)
+
+        elif rbd_cache.lower() == "disabled":
+            ctxt['rbd_client_cache_settings'] = {'rbd cache': 'false'}
+
         return ctxt