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 2015/12/13 00:14:02 UTC
[1/2] git commit: updated refs/heads/4.6 to fcccaaa
Repository: cloudstack
Updated Branches:
refs/heads/4.6 a7b098ff1 -> fcccaaad3
CLOUDSTACK-9151 - Removes the replacement of the VRID in the CsRedundant file
- Just like with RVRs, use the VRID 51 instead of making it dependent on the VPCID
- Reason: arbitary unique number 0..255 used to differentiate multiple instances of vrrpd running on the same NIC (and hence same socket). virtual_router_id 51
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2bebb7f8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2bebb7f8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2bebb7f8
Branch: refs/heads/4.6
Commit: 2bebb7f8a38c3ef94bbd55c69d7ec1070450dc22
Parents: 1597a4c
Author: Wilder Rodrigues <wr...@schubergphilis.com>
Authored: Sat Dec 12 16:26:00 2015 +0100
Committer: Wilder Rodrigues <wr...@schubergphilis.com>
Committed: Sat Dec 12 16:26:00 2015 +0100
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2bebb7f8/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py
index 505b520..d853eb9 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py
@@ -137,8 +137,6 @@ class CsRedundant(object):
" router_id ", " router_id %s" % self.cl.get_name())
keepalived_conf.search(
" interface ", " interface %s" % guest.get_device())
- keepalived_conf.search(
- " virtual_router_id ", " virtual_router_id %s" % self.cl.get_router_id())
keepalived_conf.greplace("[RROUTER_BIN_PATH]", self.CS_ROUTER_DIR)
keepalived_conf.section("authentication {", "}", [
" auth_type AH \n", " auth_pass %s\n" % self.cl.get_router_password()])
[2/2] git commit: updated refs/heads/4.6 to fcccaaa
Posted by re...@apache.org.
Merge pull request #1231 from ekholabs/fix/vrid-rvpc-CLOUDSTACK-9151
CLOUDSTACK-9151 - As a Developer I want the VRID to be set within the limits of KeepaliveDThis PR fixes a blocker issue!
- Just like with RVRs, use the VRID 51 instead of making it dependent on the VPCID
- Reason: arbitary unique number 0..255 used to differentiate multiple instances of vrrpd running on the same NIC (and hence same socket). virtual_router_id 51
* pr/1231:
CLOUDSTACK-9151 - Removes the replacement of the VRID in the CsRedundant file
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/fcccaaad
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fcccaaad
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fcccaaad
Branch: refs/heads/4.6
Commit: fcccaaad3f53a628776fa59b79a16a2afb64170f
Parents: a7b098f 2bebb7f
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sun Dec 13 00:13:37 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sun Dec 13 00:13:37 2015 +0100
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------