aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--sfc/lib/utils.py7
2 files changed, 8 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index e7c25c17..58dd4eed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
/docs_build/
/docs_output/
/releng/
+*pyc
+/sfc.egg-info/
+*ovs-logs/
diff --git a/sfc/lib/utils.py b/sfc/lib/utils.py
index 2f98f6ff..02782765 100644
--- a/sfc/lib/utils.py
+++ b/sfc/lib/utils.py
@@ -34,6 +34,8 @@ def run_cmd(cmd):
stderr=subprocess.PIPE)
(output, errors) = pipe.communicate()
+ logger.debug("running [%s] returns: <%s> - %s "
+ "" % (cmd, pipe.returncode, output))
if output:
output = output.strip()
if pipe.returncode != 0 or len(errors) > 0:
@@ -400,8 +402,9 @@ def setup_compute_node(cidr):
ip_computes = get_openstack_node_ips("compute")
for ip_compute in ip_computes:
run_cmd_on_compute("ifconfig br-int up", ip_compute)
- if not run_cmd_on_compute("ip route|grep -o %s" % cidr, ip_compute):
+ if not run_cmd_on_compute(
+ "ip route|grep -o %s || true" % cidr, ip_compute):
logger.info("adding route %s in %s" % (cidr, ip_compute))
- run_cmd_on_compute("ip route add %s" % cidr, ip_compute)
+ run_cmd_on_compute("ip route add %s dev br-int" % cidr, ip_compute)
else:
logger.info("route %s exists" % cidr)