Merge lp:~hopem/charms/trusty/nova-compute/fix-libvirt-bin into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[Edward Hope-Morley]

[lp:~hopem/charms/trusty/nova-compute/fix-libvirt-bin]

116. By Edward Hope-Morley on 2015-03-31

Fixes broken rev 112 by using /etc/init.d/libvirt-bin.override
instead of /etc/default/libvirt-bin

[James Page (james-page)]

review: Approve

=== modified file 'hooks/nova_compute_context.py'
--- hooks/nova_compute_context.py	2015-03-31 08:46:52 +0000
+++ hooks/nova_compute_context.py	2015-03-31 13:23:07 +0000
@@ -128,6 +128,16 @@
         return ctxt
 
 
+class NovaComputeLibvirtOverrideContext(context.OSContextGenerator):
+    """Provides overrides to the libvirt-bin service"""
+    interfaces = []
+
+    def __call__(self):
+        ctxt = {}
+        ctxt['overrides'] = "limit nofile 65535 65535"
+        return ctxt
+
+
 class NovaComputeVirtContext(context.OSContextGenerator):
     interfaces = []
 

=== modified file 'hooks/nova_compute_utils.py'
--- hooks/nova_compute_utils.py	2015-03-31 11:43:21 +0000
+++ hooks/nova_compute_utils.py	2015-03-31 13:23:07 +0000
@@ -41,6 +41,7 @@
     CloudComputeContext,
     MetadataServiceContext,
     NovaComputeLibvirtContext,
+    NovaComputeLibvirtOverrideContext,
     NovaComputeCephContext,
     NeutronComputeContext,
     InstanceConsoleContext,
@@ -63,6 +64,7 @@
 QEMU_CONF = '/etc/libvirt/qemu.conf'
 LIBVIRTD_CONF = '/etc/libvirt/libvirtd.conf'
 LIBVIRT_BIN = '/etc/default/libvirt-bin'
+LIBVIRT_BIN_OVERRIDES = '/etc/init/libvirt-bin.override'
 NOVA_CONF = '%s/nova.conf' % NOVA_CONF_DIR
 
 BASE_RESOURCE_MAP = {
@@ -78,6 +80,10 @@
         'services': ['libvirt-bin'],
         'contexts': [NovaComputeLibvirtContext()],
     },
+    LIBVIRT_BIN_OVERRIDES: {
+        'services': ['libvirt-bin'],
+        'contexts': [NovaComputeLibvirtOverrideContext()],
+    },
     NOVA_CONF: {
         'services': ['nova-compute'],
         'contexts': [context.AMQPContext(ssl_dir=NOVA_CONF_DIR),

=== modified file 'templates/libvirt-bin'
--- templates/libvirt-bin	2015-03-31 08:46:52 +0000
+++ templates/libvirt-bin	2015-03-31 13:23:07 +0000
@@ -14,6 +14,3 @@
 
 # pass in location of kerberos keytab
 #export KRB5_KTNAME=/etc/libvirt/libvirt.keytab
-
-# Increase nofile limits to support use with ceph rbd volumes
-limit nofile 65535 65535

=== added file 'templates/libvirt-bin.override'
--- templates/libvirt-bin.override	1970-01-01 00:00:00 +0000
+++ templates/libvirt-bin.override	2015-03-31 13:23:07 +0000
@@ -0,0 +1,3 @@
+{% if overrides -%}
+{{ overrides }}
+{% endif -%}