x/charm-plumgrid-gateway
Code Issues Proposed changes

Merge: Fix for SOL-708, SOL-715. Adding rmmod before modprobe in case of package upgrade. Increasing timeout between stop start of plumgrid service

Browse Source
This commit is contained in:
Bilal Baqar 2015-11-19 01:41:20 -08:00
commit 1891de34ce
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hooks/pg_gw_hooks.py
View File

@ -78,6 +78,7 @@ def config_changed():
pkgs = determine_packages() pkgs = determine_packages()
for pkg in pkgs: for pkg in pkgs:
apt_install(pkg, options=['--force-yes'], fatal=True) apt_install(pkg, options=['--force-yes'], fatal=True)
remove_iovisor()
load_iovisor() load_iovisor()
ensure_mtu() ensure_mtu()
ensure_files() ensure_files()

5
hooks/pg_gw_utils.py
View File

@ -140,10 +140,10 @@ def restart_pg():
Stops and Starts PLUMgrid service after flushing iptables. Stops and Starts PLUMgrid service after flushing iptables.
''' '''
service_stop('plumgrid') service_stop('plumgrid')
time.sleep(2) time.sleep(30)
_exec_cmd(cmd=['iptables', '-F']) _exec_cmd(cmd=['iptables', '-F'])
service_start('plumgrid') service_start('plumgrid')
time.sleep(5) time.sleep(30)
def stop_pg(): def stop_pg():
@ -167,6 +167,7 @@ def remove_iovisor():
''' '''
_exec_cmd(cmd=['rmmod', 'iovisor'], _exec_cmd(cmd=['rmmod', 'iovisor'],
error_msg='Error Loading Iovisor Kernel Module') error_msg='Error Loading Iovisor Kernel Module')
time.sleep(1)
def get_mgmt_interface(): def get_mgmt_interface():