diff options
| author |   “Manuel Buil” <mbuil@suse.com> | 2017-02-13 15:05:58 +0100 |
|---|---|---|
| committer | “Manuel Buil” <mbuil@suse.com> | 2017-02-13 15:24:16 +0100 |
| commit | a67845b641d522516f0b79e13f576eae5c4fc65f (patch) | |
| tree | 10bfb1f3c5dc1004fb62c152f3500bf77f452c61 | |
| parent | 065fba5bef236f992bd5e4122e635bb21d525af9 (diff) | |
Fix bugs when setting up computes
JIRA: SFC-71
1 - dev br-int was missing when adding the route
2 - grep exits with 1 when nothing is found triggering an ERROR log even though
there was not error
Change-Id: Ib65d74d4b01021dcabb5af9068451b97c0170f75
Signed-off-by: “Manuel Buil” <mbuil@suse.com>
| -rw-r--r-- | sfc/lib/utils.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sfc/lib/utils.py b/sfc/lib/utils.py index 2f98f6ff..186cbd91 100644 --- a/sfc/lib/utils.py +++ b/sfc/lib/utils.py @@ -400,8 +400,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) |