You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2017/02/03 01:02:53 UTC
[1/3] git commit: updated refs/heads/master to 5309c42
Repository: cloudstack
Updated Branches:
refs/heads/master 17787a194 -> 5309c4205
CLOUDSTACK-9692: Fix password server issue in redundant VRs
The password server in RVRs has wrong parameters as the gateway of guest nics is None.
In this case, we should get the gateway from /var/cache/cloud/cmdline.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/066b374c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/066b374c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/066b374c
Branch: refs/heads/master
Commit: 066b374c35bdfc5e35578e800499919fadcd42c1
Parents: ee83b02
Author: Wei Zhou <w....@tech.leaseweb.com>
Authored: Tue Dec 27 11:19:02 2016 +0100
Committer: Wei Zhou <w....@tech.leaseweb.com>
Committed: Fri Dec 30 09:35:00 2016 +0100
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/066b374c/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
index c280555..f2bce44 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
@@ -137,7 +137,7 @@ class CsInterface:
return self.get_attr("netmask")
def get_gateway(self):
- if self.config.is_vpc() or self.config.cmdline().is_redundant():
+ if self.config.is_vpc() or not self.is_guest():
return self.get_attr("gateway")
else:
return self.config.cmdline().get_guest_gw()
[3/3] git commit: updated refs/heads/master to 5309c42
Posted by ra...@apache.org.
Merge release branch 4.9 to master
* 4.9:
CLOUDSTACK-9692: Fix password server issue in redundant VRs
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5309c420
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5309c420
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5309c420
Branch: refs/heads/master
Commit: 5309c420582df21eb71fccddbed11b374ee0b708
Parents: 17787a1 42f0340
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Fri Feb 3 06:32:27 2017 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Fri Feb 3 06:32:27 2017 +0530
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] git commit: updated refs/heads/master to 5309c42
Posted by ra...@apache.org.
Merge pull request #1871 from ustcweizhou/RVR-passwd-server
[4.9] CLOUDSTACK-9692: Fix password server issue in redundant VRsThe password server in RVRs has wrong parameters as the gateway of guest nics is None.
In this case, we should get the gateway from /var/cache/cloud/cmdline.
This issue is caused by commit 45642b83821ce0ecd6d4cddb76a77a2481e54d9a
* pr/1871:
CLOUDSTACK-9692: Fix password server issue in redundant VRs
Signed-off-by: Rajani Karuturi <ra...@accelerite.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/42f0340a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/42f0340a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/42f0340a
Branch: refs/heads/master
Commit: 42f0340a1daa4c7cd483b18c41b1f2b4deea6c38
Parents: 8b6e96b 066b374
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Fri Feb 3 06:31:55 2017 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Fri Feb 3 06:31:55 2017 +0530
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------