Merge pull request #407 from zmarano/master

Remove the bits that disabled IPv6 for GCE.
This commit is contained in:
Anders Ingemann 2017-11-09 19:50:22 +01:00 committed by GitHub
commit 503b15d75e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 19 deletions

View file

@ -3,7 +3,6 @@ import tasks.apt
import tasks.boot import tasks.boot
import tasks.configuration import tasks.configuration
import tasks.image import tasks.image
import tasks.host
import tasks.packages import tasks.packages
from bootstrapvz.common.tasks import apt, boot, image, loopback, initd from bootstrapvz.common.tasks import apt, boot, image, loopback, initd
from bootstrapvz.common.tasks import ssh, volume, grub from bootstrapvz.common.tasks import ssh, volume, grub
@ -22,7 +21,6 @@ def resolve_tasks(taskset, manifest):
loopback.Create, loopback.Create,
tasks.packages.DefaultPackages, tasks.packages.DefaultPackages,
tasks.configuration.GatherReleaseInformation, tasks.configuration.GatherReleaseInformation,
tasks.host.DisableIPv6,
tasks.boot.ConfigureGrub, tasks.boot.ConfigureGrub,
initd.InstallInitScripts, initd.InstallInitScripts,
boot.BlackListModules, boot.BlackListModules,

View file

@ -1,17 +0,0 @@
from bootstrapvz.base import Task
from bootstrapvz.common import phases
from bootstrapvz.common.tasks import network
import os.path
class DisableIPv6(Task):
description = "Disabling IPv6 support"
phase = phases.system_modification
predecessors = [network.ConfigureNetworkIF]
@classmethod
def run(cls, info):
network_configuration_path = os.path.join(info.root, 'etc/sysctl.d/70-disable-ipv6.conf')
with open(network_configuration_path, 'w') as config_file:
print >>config_file, "net.ipv6.conf.all.disable_ipv6 = 1"
print >>config_file, "net.ipv6.conf.lo.disable_ipv6 = 0"