From 78c43669e5c175bf4bbe6b4857ec4c9fcd53b402 Mon Sep 17 00:00:00 2001 From: Remi Bergsma Date: Fri, 29 Jan 2016 19:25:29 +0100 Subject: [PATCH 1/3] CLOUDSTACK-9264: Make /32 static routes for private gw work --- systemvm/patches/debian/config/opt/cloud/bin/configure.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/systemvm/patches/debian/config/opt/cloud/bin/configure.py b/systemvm/patches/debian/config/opt/cloud/bin/configure.py index ac773a5788e..ab134fcfca7 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) From a40415604a9a8bbdc7833d850c4f74d66236d334 Mon Sep 17 00:00:00 2001 From: Remi Bergsma Date: Sat, 30 Jan 2016 06:24:03 +0100 Subject: [PATCH 2/3] CLOUDSTACK-9266: Make deleting static routes in private gw work --- .../debian/config/opt/cloud/bin/cs_staticroutes.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py b/systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py index 987005baa93..209eefe41fc 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py @@ -21,13 +21,5 @@ from pprint import pprint def merge(dbag, staticroutes): for route in staticroutes['routes']: key = route['network'] - revoke = route['revoke'] - if revoke: - try: - del dbag[key] - except KeyError: - pass - else: - dbag[key] = route - + dbag[key] = route return dbag From ec3af9962b63ed4847de78d79a4275649fe8887b Mon Sep 17 00:00:00 2001 From: Remi Bergsma Date: Fri, 29 Jan 2016 20:53:19 +0100 Subject: [PATCH 3/3] Display hostname the VPC router runs on This is displayed on Infra tab and it's annoying that on the VPC page only the link local is mentioned and not the hostname. That is now corrected, so you have the correct details to login to the router straight away. --- ui/scripts/network.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index a978d07265f..bb599fd5ec5 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -5859,6 +5859,9 @@ linklocalip: { label: 'label.linklocal.ip' }, + hostname: { + label: 'label.host' + }, state: { label: 'label.state' },