Skip to content

[config] Avoid error in config load_mgmt_conf when mgmt is already co… #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
taoyl-ms merged 3 commits into from
Oct 6, 2017
Merged

[config] Avoid error in config load_mgmt_conf when mgmt is already co… #126

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a476f1d
[config] Avoid error in config load_mgmt_conf when mgmt is already co…
taoyl-ms Oct 6, 2017
17523a0
Add an ignore_error option to run_commmand()
taoyl-ms Oct 6, 2017
abcc013
Fix typo
taoyl-ms Oct 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions config/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# Helper functions
#

def run_command(command, display_cmd=False):
def run_command(command, display_cmd=False, ignore_error=False):
"""Run bash command and print output to stdout
"""
if display_cmd == True:
Expand All @@ -29,7 +29,7 @@ def run_command(command, display_cmd=False):
if len(out) > 0:
click.echo(out)

if proc.returncode != 0:
if proc.returncode != 0 and not ignore_error:
sys.exit(proc.returncode)

def _is_neighbor_ipaddress(ipaddress):
Expand Down Expand Up @@ -149,11 +149,11 @@ def load_mgmt_config(filename):
command = "ifconfig eth0 {} netmask {}".format(str(mgmt_conf.ip), str(mgmt_conf.netmask))
run_command(command, display_cmd=True)
command = "ip route add default via {} dev eth0 table default".format(gw_addr)
run_command(command, display_cmd=True)
run_command(command, display_cmd=True, ignore_error=True)
command = "ip rule add from {} table default".format(str(mgmt_conf.ip))
run_command(command, display_cmd=True)
run_command(command, display_cmd=True, ignore_error=True)
command = "[ -f /var/run/dhclient.eth0.pid ] && kill `cat /var/run/dhclient.eth0.pid` && rm -f /var/run/dhclient.eth0.pid"
run_command(command, display_cmd=True)
run_command(command, display_cmd=True. ignore_error=True)
Copy link
Copy Markdown
Contributor

@jleveque jleveque Oct 6, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like a typo, period instead of comma after first "True": display_cmd=True.

print "Please note loaded setting will be lost after system reboot. To preserve setting, run `config save`."

@cli.command()
Expand Down