← Back to branch summary

~gnuoy/charms/trusty/nova-compute/1427660

« back to all changes in this revision

Viewing changes to hooks/nova_compute_utils.py

  • Committer: james.page at ubuntu
  • Date: 2014-06-01 14:26:17 UTC
  • mto: (83.2.1 nova-compute.lp1286762)
  • mto: This revision was merged to the branch mainline in revision 94.
  • Revision ID: james.page@ubuntu.com-20140601142617-r56j67iagf4xn0ed
Revert accidental commits

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/nova_compute_utils.py
51
51
 
52
52
BASE_RESOURCE_MAP = {
53
53
    QEMU_CONF: {
54
 
        'services': [],
 
54
        'services': ['libvirt-bin'],
55
55
        'contexts': [],
56
56
    },
57
57
    LIBVIRTD_CONF: {
58
 
        'services': [],
59
 
        'contexts': [],
 
58
        'services': ['libvirt-bin'],
 
59
        'contexts': [NovaComputeLibvirtContext()],
60
60
    },
61
61
    LIBVIRT_BIN: {
62
 
        'services': [],
63
 
        'contexts': [],
 
62
        'services': ['libvirt-bin'],
 
63
        'contexts': [NovaComputeLibvirtContext()],
64
64
    },
65
65
    NOVA_CONF: {
66
 
        'services': [],
 
66
        'services': ['nova-compute'],
67
67
        'contexts': [context.AMQPContext(ssl_dir=NOVA_CONF_DIR),
68
68
                     context.SharedDBContext(
69
69
                         relation_prefix='nova', ssl_dir=NOVA_CONF_DIR),
376
376
    ]
377
377
 
378
378
    apt_upgrade(options=dpkg_opts, fatal=True, dist=True)
379
 
    #apt_install(determine_packages(), fatal=True)
 
379
    apt_install(determine_packages(), fatal=True)
380
380
 
381
381
    # Regenerate configs in full for new release
382
382
    configs = register_configs()