From 9b2b56b53b7eeb8f1c796f1404014a97d2e1a888 Mon Sep 17 00:00:00 2001 From: Ossi Herrala Date: Mon, 6 Feb 2012 14:43:21 +0000 Subject: [PATCH] Change IPv4 gateway to empty string so IPv6 only default routes are possible. Add fail when trying to set custom IPv6 routes. Someone will fix it someday when there's need. --- network/manifests/init.pp | 5 ++++- network/templates/route-if.erb | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/network/manifests/init.pp b/network/manifests/init.pp index 39e3598..a955025 100644 --- a/network/manifests/init.pp +++ b/network/manifests/init.pp @@ -230,7 +230,7 @@ define network::interface($ipaddr = "none", $eaddr = "none", $netmask = "none", # $device: # Interface to use for this route. # -define network::route($gateway, $device, $ipv6gateway = "") { +define network::route($gateway = "", $device, $ipv6gateway = "") { case $name { "default": { @@ -283,6 +283,9 @@ define network::route($gateway, $device, $ipv6gateway = "") { } } default: { + if ipv6gateway != "" { + fail("Custom IPv6 routes not supported yet.") + } case $operatingsystem { "fedora","centos": { include network::helper::restart diff --git a/network/templates/route-if.erb b/network/templates/route-if.erb index 93baca6..0563de4 100644 --- a/network/templates/route-if.erb +++ b/network/templates/route-if.erb @@ -1,3 +1,3 @@ ADDRESS0=<%= name.split('/')[0] %> NETMASK0=<%= name.split('/')[1] %> -<% if gateway != "NONE" %>GATEWAY0=<%= gateway %><% end %> +<% if gateway != "" %>GATEWAY0=<%= gateway %><% end %>