← Back to branch summary

~1chb1n/charms/trusty/neutron-openvswitch/stable-flip-tests-helper-syncs

« back to all changes in this revision

Viewing changes to hooks/neutron_ovs_utils.py

  • Committer: Liam Young
  • Date: 2015-04-01 15:03:02 UTC
  • mfrom: (31.3.31 neutron-openvswitch)
  • Revision ID: liam.young@canonical.com-20150401150302-717comym857n0ebi
[james-page, r=gnuoy] Add 0mq support

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/neutron_ovs_utils.py
44
44
    (NEUTRON_CONF, {
45
45
        'services': ['neutron-plugin-openvswitch-agent'],
46
46
        'contexts': [neutron_ovs_context.OVSPluginContext(),
47
 
                     context.AMQPContext(ssl_dir=NEUTRON_CONF_DIR)],
 
47
                     context.AMQPContext(ssl_dir=NEUTRON_CONF_DIR),
 
48
                     context.ZeroMQContext(),
 
49
                     context.NotificationDriverContext()],
48
50
    }),
49
51
    (ML2_CONF, {
50
52
        'services': ['neutron-plugin-openvswitch-agent'],
122
124
    return {k: v['services'] for k, v in resource_map().iteritems()}
123
125
 
124
126
 
 
127
def get_topics():
 
128
    topics = []
 
129
    topics.append('q-agent-notifier-port-update')
 
130
    topics.append('q-agent-notifier-network-delete')
 
131
    topics.append('q-agent-notifier-tunnel-update')
 
132
    topics.append('q-agent-notifier-security_group-update')
 
133
    topics.append('q-agent-notifier-dvr-update')
 
134
    if context.NeutronAPIContext()()['l2_population']:
 
135
        topics.append('q-agent-notifier-l2population-update')
 
136
    return topics
 
137
 
 
138
 
125
139
def configure_ovs():
126
140
    if not service_running('openvswitch-switch'):
127
141
        full_restart()