← Back to branch summary

~openstack-charmers/charms/precise/quantum-gateway/old-1410

« back to all changes in this revision

Viewing changes to hooks/quantum_contexts.py

  • Committer: james.page at ubuntu
  • Date: 2014-10-03 11:24:24 UTC
  • mfrom: (67.1.3 quantum-gateway)
  • Revision ID: james.page@ubuntu.com-20141003112424-8jio8r1i4f3ao12x
[gnuoy,r=james-page] Add support for configurable tenant network overlay type from neutron-api

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/quantum_contexts.py
107
107
    '''
108
108
    neutron_settings = {
109
109
        'l2_population': True,
 
110
        'overlay_network_type': 'gre',
110
111
 
111
112
    }
112
113
    for rid in relation_ids('neutron-plugin-api'):
116
117
                continue
117
118
            neutron_settings = {
118
119
                'l2_population': rdata['l2-population'],
 
120
                'overlay_network_type': rdata['overlay-network-type'],
119
121
            }
120
122
            return neutron_settings
121
123
    return neutron_settings
214
216
            'verbose': config('verbose'),
215
217
            'instance_mtu': config('instance-mtu'),
216
218
            'l2_population': neutron_api_settings['l2_population'],
 
219
            'overlay_network_type':
 
220
            neutron_api_settings['overlay_network_type'],
217
221
        }
218
222
        return ctxt
219
223