cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [04/20] git commit: updated refs/heads/4.3 to 67df5b9
Date Tue, 25 Nov 2014 19:05:00 GMT
CLOUDSTACK-6908: Enable IPv6 in sysctl when only necessary

This new way would only enable IPv6 when VR is created in IPv6 shared network.
Otherwise IPv6 sysctl options remain disable.

(cherry picked from commit c181485ae596f49d9dfd8b78f4184ab7fcad6a8a)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bad40a74
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bad40a74
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bad40a74

Branch: refs/heads/4.3
Commit: bad40a74812c929ca643accaa6485516a5e0b309
Parents: 7f1dd86
Author: Sheng Yang <sheng.yang@citrix.com>
Authored: Fri Jun 13 11:05:35 2014 -0700
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Tue Nov 25 22:45:58 2014 +0530

----------------------------------------------------------------------
 systemvm/patches/debian/config/etc/init.d/cloud-early-config | 1 +
 systemvm/patches/debian/config/etc/sysctl.conf               | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bad40a74/systemvm/patches/debian/config/etc/init.d/cloud-early-config
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/init.d/cloud-early-config b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
index 4783ec2..8cc927f 100755
--- a/systemvm/patches/debian/config/etc/init.d/cloud-early-config
+++ b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
@@ -387,6 +387,7 @@ setup_interface() {
 
 setup_interface_ipv6() {
   sysctl net.ipv6.conf.all.disable_ipv6=0
+  sysctl net.ipv6.conf.all.forwarding=1
   sysctl net.ipv6.conf.all.accept_ra=1
   
   local intfnum=$1

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bad40a74/systemvm/patches/debian/config/etc/sysctl.conf
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/sysctl.conf b/systemvm/patches/debian/config/etc/sysctl.conf
index d15276a..1ba1282 100644
--- a/systemvm/patches/debian/config/etc/sysctl.conf
+++ b/systemvm/patches/debian/config/etc/sysctl.conf
@@ -51,8 +51,8 @@ net.nf_conntrack_max = 1000000
 net.netfilter.nf_conntrack_max = 1000000
 
 # Disable IPv6
-net.ipv6.conf.all.disable_ipv6 = 0
-net.ipv6.conf.all.forwarding = 1
-net.ipv6.conf.all.accept_ra = 1
+net.ipv6.conf.all.disable_ipv6 = 1
+net.ipv6.conf.all.forwarding = 0
+net.ipv6.conf.all.accept_ra = 0
 net.ipv6.conf.all.accept_redirects = 0
 net.ipv6.conf.all.autoconf = 0


Mime
View raw message