← Back to branch summary

~hazmat/charms/precise/quantum-gateway/ssl-everywhere

« back to all changes in this revision

Viewing changes to hooks/quantum_utils.py

  • Committer: James Page
  • Date: 2013-11-17 21:53:21 UTC
  • mfrom: (37.1.5 quantum-gateway)
  • Revision ID: james.page@canonical.com-20131117215321-o4o6uje3itj2e4se
[gandelman-a][james-page] NVP support

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/quantum_utils.py
80
80
        "nova-api-metadata"
81
81
    ],
82
82
    NVP: [
83
 
        "openvswitch-switch",
84
83
        "neutron-dhcp-agent",
85
84
        'python-mysqldb',
86
85
        'python-oslo.config',  # Force upgrade
95
94
 
96
95
EARLY_PACKAGES = {
97
96
    OVS: ['openvswitch-datapath-dkms'],
98
 
    NVP: ['openvswitch-datapath-dkms']
 
97
    NVP: []
99
98
}
100
99
 
101
100
 
396
395
 
397
396
 
398
397
def configure_ovs():
399
 
    if not service_running('openvswitch-switch'):
400
 
        full_restart()
401
398
    if config('plugin') == OVS:
 
399
        if not service_running('openvswitch-switch'):
 
400
            full_restart()
402
401
        add_bridge(INT_BRIDGE)
403
402
        add_bridge(EXT_BRIDGE)
404
403
        ext_port = config('ext-port')
405
404
        if ext_port:
406
405
            add_bridge_port(EXT_BRIDGE, ext_port)
407
 
    if config('plugin') == NVP:
408
 
        add_bridge(INT_BRIDGE)