openstack/charm-neutron-gateway
Code Issues Proposed changes

Ensure openvswitch-switch service is running before attempting to configure OVS.

Browse Source
This commit is contained in:
Adam Gandelman 2013-10-11 15:19:03 -07:00
parent 0fb65a38b9
commit 245d9d364b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hooks/quantum_utils.py
View File

@ -1,3 +1,4 @@
from charmhelpers.core.host import service_running
from charmhelpers.core.hookenv import ( from charmhelpers.core.hookenv import (
log, log,
config, config,
@ -8,7 +9,8 @@ from charmhelpers.fetch import (
) )
from charmhelpers.contrib.network.ovs import ( from charmhelpers.contrib.network.ovs import (
add_bridge, add_bridge,
add_bridge_port add_bridge_port,
full_restart,
) )
from charmhelpers.contrib.openstack.utils import ( from charmhelpers.contrib.openstack.utils import (
configure_installation_source, configure_installation_source,
@ -391,6 +393,8 @@ def do_openstack_upgrade(configs):
def configure_ovs(): def configure_ovs():
if not service_running('openvswitch-switch'):
full_restart()
if config('plugin') == OVS: if config('plugin') == OVS:
add_bridge(INT_BRIDGE) add_bridge(INT_BRIDGE)
add_bridge(EXT_BRIDGE) add_bridge(EXT_BRIDGE)