You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2016/02/04 09:12:33 UTC
[1/2] git commit: updated refs/heads/4.7 to 556d436
Repository: cloudstack
Updated Branches:
refs/heads/4.7 e5ef9336e -> 556d4362f
CLOUDSTACK-9264: Make /32 static routes for private gw work
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/78c43669
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/78c43669
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/78c43669
Branch: refs/heads/4.7
Commit: 78c43669e5c175bf4bbe6b4857ec4c9fcd53b402
Parents: 333957f
Author: Remi Bergsma <gi...@remi.nl>
Authored: Fri Jan 29 19:25:29 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Fri Jan 29 19:25:29 2016 +0100
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/configure.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/78c43669/systemvm/patches/debian/config/opt/cloud/bin/configure.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/configure.py b/systemvm/patches/debian/config/opt/cloud/bin/configure.py
index ac773a5..ab134fc 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/configure.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/configure.py
@@ -85,13 +85,13 @@ class CsStaticRoutes(CsDataBag):
def __update(self, route):
if route['revoke']:
- command = "route del -net %s gw %s" % (route['network'], route['gateway'])
+ command = "ip route del %s via %s" % (route['network'], route['gateway'])
result = CsHelper.execute(command)
else:
command = "ip route show | grep %s | awk '{print $1, $3}'" % route['network']
result = CsHelper.execute(command)
if not result:
- route_command = "route add -net %s gw %s" % (route['network'], route['gateway'])
+ route_command = "ip route add %s via %s" % (route['network'], route['gateway'])
result = CsHelper.execute(route_command)
[2/2] git commit: updated refs/heads/4.7 to 556d436
Posted by re...@apache.org.
Merge pull request #1383 from remibergsma/slash32routefix
CLOUDSTACK-9264: Make /32 static routes for private gw workStatic routes for private gateways that were /32 failed because the `route` command used had `-net` in it and a `/32` requires `-host` instead. I rewrote it to `ip` commands.
* pr/1383:
CLOUDSTACK-9264: Make /32 static routes for private gw work
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/556d4362
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/556d4362
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/556d4362
Branch: refs/heads/4.7
Commit: 556d4362f157be975476024edf896705848b2f93
Parents: e5ef933 78c4366
Author: Remi Bergsma <gi...@remi.nl>
Authored: Thu Feb 4 09:12:01 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Thu Feb 4 09:12:01 2016 +0100
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/configure.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------