← Back to branch summary

~bbaqar/charms/trusty/nova-compute/trunk

« back to all changes in this revision

Viewing changes to hooks/nova_compute_utils.py

[hopem,r=jamespage]

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/nova_compute_utils.py
41
41
    CloudComputeContext,
42
42
    MetadataServiceContext,
43
43
    NovaComputeLibvirtContext,
 
44
    NovaComputeLibvirtOverrideContext,
44
45
    NovaComputeCephContext,
45
46
    NeutronComputeContext,
46
47
    InstanceConsoleContext,
63
64
QEMU_CONF = '/etc/libvirt/qemu.conf'
64
65
LIBVIRTD_CONF = '/etc/libvirt/libvirtd.conf'
65
66
LIBVIRT_BIN = '/etc/default/libvirt-bin'
 
67
LIBVIRT_BIN_OVERRIDES = '/etc/init/libvirt-bin.override'
66
68
NOVA_CONF = '%s/nova.conf' % NOVA_CONF_DIR
67
69
 
68
70
BASE_RESOURCE_MAP = {
78
80
        'services': ['libvirt-bin'],
79
81
        'contexts': [NovaComputeLibvirtContext()],
80
82
    },
 
83
    LIBVIRT_BIN_OVERRIDES: {
 
84
        'services': ['libvirt-bin'],
 
85
        'contexts': [NovaComputeLibvirtOverrideContext()],
 
86
    },
81
87
    NOVA_CONF: {
82
88
        'services': ['nova-compute'],
83
89
        'contexts': [context.AMQPContext(ssl_dir=NOVA_CONF_DIR),