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:27:19 UTC
[1/7] git commit: updated refs/heads/4.8 to be89f64
Repository: cloudstack
Updated Branches:
refs/heads/4.8 69d1a5e9b -> be89f6473
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.8
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)
[5/7] git commit: updated refs/heads/4.8 to be89f64
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.8
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(-)
----------------------------------------------------------------------
[7/7] git commit: updated refs/heads/4.8 to be89f64
Posted by re...@apache.org.
Merge release branch 4.7 to 4.8
* 4.7:
Display hostname the VPC router runs on
CLOUDSTACK-9266: Make deleting static routes in private gw work
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/be89f647
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/be89f647
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/be89f647
Branch: refs/heads/4.8
Commit: be89f64731e57ef75fa441bbadbbde5973b4a17f
Parents: 69d1a5e a243339
Author: Remi Bergsma <gi...@remi.nl>
Authored: Thu Feb 4 09:26:53 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Thu Feb 4 09:26:53 2016 +0100
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/configure.py | 4 ++--
.../debian/config/opt/cloud/bin/cs_staticroutes.py | 10 +---------
ui/scripts/network.js | 3 +++
3 files changed, 6 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
[6/7] git commit: updated refs/heads/4.8 to be89f64
Posted by re...@apache.org.
Merge pull request #1386 from remibergsma/fix-del-private-gw-route
CLOUDSTACK-9266: Make deleting static routes in private gw workThe to-be-deleted static routes were removed from the json file, instead of putting them there with revoke=true. The script that parses the json now doesn't find it and thus does not delete it.
Example after adding/removing some:
```
root@r-3-VM:/var/cache/cloud# cat /etc/cloudstack/staticroutes.json
{
"1.2.3.0/24": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "1.2.3.0/24",
"revoke": true
},
"1.2.3.4/32": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "1.2.3.4/32",
"revoke": true
},
"1.2.33.3/32": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "1.2.33.3/32",
"revoke": true
},
"1.22.2.2/32": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "1.22.2.2/32",
"revoke": true
},
"10.1.2.1/32": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "10.1.2.1/32",
"revoke": true
},
"10.1.200.0/25": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "10.1.200.0/25",
"revoke": true
},
"10.11.12.13/32": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "10.11.12.13/32",
"revoke": true
},
"172.16.1.3/32": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "172.16.1.3/32",
"revoke": true
},
"172.16.15.14/32": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "172.16.15.14/32",
"revoke": false
},
"172.16.17.0/25": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "172.16.17.0/25",
"revoke": false
},
"id": "staticroutes"
}
```
This results in:
```
root@r-3-VM:/var/cache/cloud# ip route show
default via 192.168.23.1 dev eth1
169.254.0.0/16 dev eth0 proto kernel scope link src 169.254.1.67
172.16.0.0/24 dev eth2 proto kernel scope link src 172.16.0.2
172.16.15.14 via 172.16.0.1 dev eth2
172.16.17.0/25 via 172.16.0.1 dev eth2
192.168.23.0/24 dev eth1 proto kernel scope link src 192.168.23.4
```
Two static routes left, the rest deleted:
```
172.16.15.14 via 172.16.0.1 dev eth2
172.16.17.0/25 via 172.16.0.1 dev eth2
```
That also matches the UI:
<img width="1327" alt="screen shot 2016-01-30 at 06 34 06" src="https://cloud.githubusercontent.com/assets/1630096/12693933/83e67d80-c71b-11e5-9241-9f478522b7a4.png">
* pr/1386:
CLOUDSTACK-9266: Make deleting static routes in 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/a243339f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a243339f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a243339f
Branch: refs/heads/4.8
Commit: a243339faac1736fd402c4be88174527dbd2e958
Parents: 556d436 a404156
Author: Remi Bergsma <gi...@remi.nl>
Authored: Thu Feb 4 09:13:00 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Thu Feb 4 09:13:00 2016 +0100
----------------------------------------------------------------------
.../debian/config/opt/cloud/bin/cs_staticroutes.py | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
[2/7] git commit: updated refs/heads/4.8 to be89f64
Posted by re...@apache.org.
CLOUDSTACK-9266: Make deleting static routes in 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/a4041560
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a4041560
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a4041560
Branch: refs/heads/4.8
Commit: a40415604a9a8bbdc7833d850c4f74d66236d334
Parents: 333957f
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sat Jan 30 06:24:03 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sat Jan 30 06:25:00 2016 +0100
----------------------------------------------------------------------
.../debian/config/opt/cloud/bin/cs_staticroutes.py | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4041560/systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py
----------------------------------------------------------------------
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 987005b..209eefe 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
[4/7] git commit: updated refs/heads/4.8 to be89f64
Posted by re...@apache.org.
Merge pull request #1384 from remibergsma/ui-display-vpc-router-host
Display hostname the VPC router runs onThe hostname a router is running on is only displayed on Infra tab and not on the VPC page (the link local is mentioned though). That is now corrected, so you have the correct details to login to the router straight away.
Before:
<img width="702" alt="screen shot 2016-01-29 at 20 58 58" src="https://cloud.githubusercontent.com/assets/1630096/12687083/f7de5760-c6cd-11e5-9f62-cdf2cce8aeed.png">
After:
<img width="704" alt="screen shot 2016-01-29 at 21 18 21" src="https://cloud.githubusercontent.com/assets/1630096/12687088/fc4d1c1e-c6cd-11e5-8573-cdde638264f7.png">
So the option 'Host' was added and displays the hypervisor the VPC runs on.
* pr/1384:
Display hostname the VPC router runs on
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/e5ef9336
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e5ef9336
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e5ef9336
Branch: refs/heads/4.8
Commit: e5ef9336e17b883bab95656771354f058198b546
Parents: 333957f ec3af99
Author: Remi Bergsma <gi...@remi.nl>
Authored: Mon Feb 1 21:10:25 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Mon Feb 1 21:10:26 2016 +0100
----------------------------------------------------------------------
ui/scripts/network.js | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
[3/7] git commit: updated refs/heads/4.8 to be89f64
Posted by re...@apache.org.
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.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ec3af996
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ec3af996
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ec3af996
Branch: refs/heads/4.8
Commit: ec3af9962b63ed4847de78d79a4275649fe8887b
Parents: 333957f
Author: Remi Bergsma <gi...@remi.nl>
Authored: Fri Jan 29 20:53:19 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sun Jan 31 19:04:43 2016 +0100
----------------------------------------------------------------------
ui/scripts/network.js | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec3af996/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index a978d07..bb599fd 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'
},