Merge lp:~mthaddon/charms/trusty/nova-compute/disk-cachemodes into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[Tom Haddon]

Allow for disk_cachemodes to be set via a config option

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

UOSCI bot says:
charm_lint_check #1106 nova-compute-next for mthaddon mp241941
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option os-data-network has no default value
  I: config.yaml: option config-flags has no default value
  I: config.yaml: option instances-path has no default value
  W: config.yaml: option disable-neutron-security-groups has no default value
  I: config.yaml: option migration-auth-type has no default value

Full lint test output: http://paste.ubuntu.com/9055857/
Build: http://10.98.191.181:8080/job/charm_lint_check/1106/

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

UOSCI bot says:
charm_unit_test #940 nova-compute-next for mthaddon mp241941
    UNIT OK: passed

UNIT Results (max last 5 lines):
  nova_compute_hooks 132 13 90% 79, 97-98, 125, 191, 249, 254-255, 261, 265-268
  nova_compute_utils 228 110 52% 161-217, 225, 230-233, 268-270, 277, 281-284, 292-300, 304, 313-322, 335-354, 380-381, 385-386, 405-426, 443-453, 467-468, 473-474
  TOTAL 566 194 66%
  Ran 56 tests in 3.492s
  OK (SKIP=5)

Full unit test output: http://paste.ubuntu.com/9055859/
Build: http://10.98.191.181:8080/job/charm_unit_test/940/

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

UOSCI bot says:
charm_amulet_test #448 nova-compute-next for mthaddon mp241941
    AMULET OK: passed

AMULET Results (max last 5 lines):
  juju-test.conductor.15-basic-trusty-icehouse RESULT :
  juju-test.conductor DEBUG : Tearing down osci-sv07 juju environment
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv07"
  WARNING cannot delete security group "juju-osci-sv07-0". Used by another environment?
  juju-test INFO : Results: 3 passed, 0 failed, 0 errored

Full amulet test output: http://paste.ubuntu.com/9056022/
Build: http://10.98.191.181:8080/job/charm_amulet_test/448/

[lp:~mthaddon/charms/trusty/nova-compute/disk-cachemodes]

88. By Tom Haddon on 2014-11-25

Add template update for juno as well

89. By Tom Haddon on 2014-11-25

Add unit test for disk_cachemodes

[Liam Young (gnuoy)]

Thank you for the merge proposal. I've included a few minor suggestions in the inline comments.

review: Needs Fixing

[lp:~mthaddon/charms/trusty/nova-compute/disk-cachemodes]

90. By Tom Haddon on 2014-11-25

Use default of None, and remove duplicate [libvirtd] entry in juno's nova.conf

[Liam Young (gnuoy)]

LGTM

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2014-09-25 16:43:39 +0000
+++ config.yaml	2014-11-25 15:11:02 +0000
@@ -56,6 +56,12 @@
     default: "yes"
     type: string
     description: Whether to run nova-api and nova-network on the compute nodes.
+  disk-cachemodes:
+    default:
+    type: string
+    description: |
+      Specific cachemodes to use for different disk types e.g:
+      file=directsync,block=none
   enable-resize:
     default: False
     type: boolean

=== modified file 'hooks/nova_compute_context.py'
--- hooks/nova_compute_context.py	2014-09-30 20:33:51 +0000
+++ hooks/nova_compute_context.py	2014-11-25 15:11:02 +0000
@@ -103,6 +103,9 @@
         if config('instances-path') is not None:
             ctxt['instances_path'] = config('instances-path')
 
+        if config('disk-cachemodes'):
+            ctxt['disk_cachemodes'] = config('disk-cachemodes')
+
         return ctxt
 
 

=== modified file 'templates/havana/nova.conf'
--- templates/havana/nova.conf	2014-07-31 15:32:21 +0000
+++ templates/havana/nova.conf	2014-11-25 15:11:02 +0000
@@ -114,3 +114,8 @@
 server_listen = 0.0.0.0
 server_proxyclient_address = {{ console_listen_addr }}
 {% endif -%}
+
+{% if disk_cachemodes -%}
+[libvirt]
+disk_cachemodes = {{ disk_cachemodes }}
+{% endif -%}

=== modified file 'templates/juno/nova.conf'
--- templates/juno/nova.conf	2014-10-14 13:20:36 +0000
+++ templates/juno/nova.conf	2014-11-25 15:11:02 +0000
@@ -114,4 +114,6 @@
 {% if live_migration_uri -%}
 live_migration_uri = {{ live_migration_uri }}
 {% endif -%}
-
+{% if disk_cachemodes -%}
+disk_cachemodes = {{ disk_cachemodes }}
+{% endif -%}

=== modified file 'unit_tests/test_nova_compute_contexts.py'
--- unit_tests/test_nova_compute_contexts.py	2014-07-14 13:24:51 +0000
+++ unit_tests/test_nova_compute_contexts.py	2014-11-25 15:11:02 +0000
@@ -181,6 +181,13 @@
         self.assertEquals(
             {'libvirtd_opts': '-d -l', 'listen_tls': 0}, libvirt())
 
+    def test_libvirt_disk_cachemodes(self):
+        self.test_config.set('disk-cachemodes', 'file=unsafe,block=none')
+        libvirt = context.NovaComputeLibvirtContext()
+        self.assertEquals(
+            {'libvirtd_opts': '-d', 'listen_tls': 0,
+             'disk_cachemodes': 'file=unsafe,block=none'}, libvirt())
+
     @patch.object(context.NeutronComputeContext, 'network_manager')
     @patch.object(context.NeutronComputeContext, 'plugin')
     def test_disable_security_groups_true(self, plugin, nm):