Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding dhcpv6c parameter for controlling DHCP for ipv6 #128

Closed
wants to merge 11 commits into from
Closed

Adding dhcpv6c parameter for controlling DHCP for ipv6 #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ab4bea4
Merge branch 'release/2.2.0'
razorsedge Jan 13, 2013
4df4b82
Merge branch 'release/3.0.0'
razorsedge May 27, 2013
9588b80
Merge branch 'release/3.1.0'
razorsedge Jul 24, 2013
5b9bf7f
Merge branch 'release/3.2.0'
razorsedge Aug 19, 2013
7599dd1
Merge branch 'release/3.3.0'
razorsedge Feb 8, 2015
e8d0c9d
Merge branch 'release/3.4.0'
razorsedge Mar 20, 2015
41b2dc4
Merge branch 'release/3.5.0'
razorsedge Jun 5, 2015
c426b1b
Merge branch 'release/3.6.0'
razorsedge Oct 8, 2015
8bd8f3f
Merge branch 'release/3.7.0'
razorsedge Mar 12, 2016
023e3df
Merge branch 'release/3.8.0'
razorsedge Mar 24, 2016
13c856f
Adding dhcpv6c parameter for controlling DHCP for ipv6
Jun 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion manifests/if/static.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
# domain => 'is.domain.com domain.com',
# ipv6init => true,
# ipv6address => '123:4567:89ab:cdef:123:4567:89ab:cdef'
# ipv6gateway => '123:4567:89ab:cdef:123:4567:89ab:1'
# ipv6gateway => '123:4567:89ab:cdef:123:4567:89ab:1'
# }
#
# === Authors:
Expand All @@ -60,6 +60,7 @@
$gateway = undef,
$ipv6address = undef,
$ipv6init = false,
$dhcpv6c = false,
$ipv6gateway = undef,
$macaddress = undef,
$manage_hwaddr = true,
Expand Down Expand Up @@ -97,13 +98,15 @@
validate_bool($ipv6init)
validate_bool($ipv6autoconf)
validate_bool($peerdns)
validate_bool($dhcpv6c)
validate_bool($ipv6peerdns)
validate_bool($manage_hwaddr)
validate_bool($flush)

network_if_base { $title:
ensure => $ensure,
ipv6init => $ipv6init,
dhcpv6c => $dhcpv6c,
ipaddress => $ipaddress,
ipv6address => $ipv6address,
netmask => $netmask,
Expand Down
2 changes: 2 additions & 0 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
$ipv6gateway = undef,
$ipv6init = false,
$ipv6autoconf = false,
$dhcpv6c = false,
$bootproto = 'none',
$userctl = false,
$mtu = undef,
Expand All @@ -136,6 +137,7 @@
validate_bool($userctl)
validate_bool($isalias)
validate_bool($peerdns)
validate_bool($dhcpv6c)
validate_bool($ipv6init)
validate_bool($ipv6autoconf)
validate_bool($ipv6peerdns)
Expand Down
1 change: 1 addition & 0 deletions spec/defines/network_if_static_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
:dns2 => '5.6.7.8',
:domain => 'somedomain.com',
:ipv6init => true,
:dhcpv6c => true,
:ipv6autoconf => true,
:ipv6peerdns => true,
:ipv6address => '123:4567:89ab:cdef:123:4567:89ab:cdef/64',
Expand Down
3 changes: 3 additions & 0 deletions templates/ifcfg-eth.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ IPV6INIT=yes
<% if !@ipv6peerdns %>IPV6_PEERDNS=no
<% else %>IPV6_PEERDNS=yes
<% end -%>
<% if @dhcpv6c %>
DHCPV6C=yes
<% end -%>
<% end -%>
<% if @bridge %>BRIDGE=<%= @bridge %>
<% end -%>
Expand Down