← Back to branch summary

~openstack-charmers-next/charms/vivid/nova-compute/trunk

« back to all changes in this revision

Viewing changes to hooks/nova_compute_hooks.py

  • Committer: James Page
  • Date: 2016-04-08 10:06:51 UTC
  • Revision ID: james.page@ubuntu.com-20160408100651-t18z7xdyuue1w1m4
Drop support for legacy Neutron management

The nova-compute charm originally managed the Neutron services
and configuration files for the hypervisor units; this has be
devolved into subordinate charms such as neutron-openvswitch
providing a nicer separation between Nova and Neutron.

Drop remaining legacy Neutron support from this charm as it was
deprecated for removal last cycle.

Change-Id: If3bd62d169c8e8804570c75e7311bf005c13683a

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/nova_compute_hooks.py
56
56
    import_keystone_ca_cert,
57
57
    initialize_ssh_keys,
58
58
    migration_enabled,
59
 
    network_manager,
60
59
    do_openstack_upgrade,
61
60
    public_ssh_key,
62
61
    restart_map,
63
62
    services,
64
63
    register_configs,
65
64
    NOVA_CONF,
66
 
    NEUTRON_CONF,
67
65
    ceph_config_file, CEPH_SECRET,
68
66
    enable_shell, disable_shell,
69
67
    configure_lxd,
70
68
    fix_path_ownership,
71
69
    get_topics,
72
70
    assert_charm_supports_ipv6,
73
 
    manage_ovs,
74
71
    install_hugepages,
75
72
    get_hugepage_number,
76
73
    assess_status,
196
193
        log('amqp relation incomplete. Peer not ready?')
197
194
        return
198
195
    CONFIGS.write(NOVA_CONF)
199
 
    # No need to write NEUTRON_CONF if neutron-plugin is managing it
200
 
    if manage_ovs():
201
 
        if network_manager() == 'neutron':
202
 
            CONFIGS.write(NEUTRON_CONF)
203
196
 
204
197
 
205
198
@hooks.hook('shared-db-relation-joined')