You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/06/14 02:32:09 UTC
git commit: updated refs/heads/4.4 to 1369a0d
Repository: cloudstack
Updated Branches:
refs/heads/4.4 473c2b480 -> 1369a0dac
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 60e46293234cccea5d2bd31588123e65af3e9bad)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1369a0da
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1369a0da
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1369a0da
Branch: refs/heads/4.4
Commit: 1369a0dacbc37a7058b9c1f07edccf508c832642
Parents: 473c2b4
Author: Sheng Yang <sh...@citrix.com>
Authored: Fri Jun 13 11:05:35 2014 -0700
Committer: Daan Hoogland <da...@onecht.net>
Committed: Sat Jun 14 02:31:55 2014 +0200
----------------------------------------------------------------------
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/1369a0da/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 b8c40db..938e6f8 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/1369a0da/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 586d5bd..961d471 100644
--- a/systemvm/patches/debian/config/etc/sysctl.conf
+++ b/systemvm/patches/debian/config/etc/sysctl.conf
@@ -42,8 +42,8 @@ net.ipv4.tcp_max_tw_buckets=1000000
net.core.somaxconn=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