Skip to content

Commit b5377e4

Browse files
committed
mac_address might be required for ipv6_dhcp_duid
1 parent d6dd2f5 commit b5377e4

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

functions/prepare_ipv6_config.pp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,22 @@
44
# $ipv6_address = semicolon separated list of the ipv6 addresses to assign to the interface in format aa::bb:cc/64
55
# $ipv6_gateway = the ipv6 gateway for the connection
66
# $ipv6_dns = semicolon seperated list of the dns servers for the interface
7-
# $ipv6_dhcp_duid = IPv6 DHCP DUID 'auto' value generates it with module from mac of the interface
87
# $ipv6_addr_gen_mode = IPv6 method for generating of automatic interface address
98
# $ipv6_privacy = should be the generated automatic address more private
109
# $ipv6_may_fail = is it ok that the ipv6 config fails?
10+
# $ipv6_dhcp_duid = IPv6 DHCP DUID 'auto' value generates it with module from mac of the interface
11+
# $mac_address = the mac of the interface for the connection
1112

1213
function networkmanager::prepare_ipv6_config (
1314
Enum['auto','dhcp','manual','ignore','link-local','disabled'] $ipv6_method,
1415
Optional[Stdlib::IP::Address::V6::CIDR] $ipv6_address,
1516
Optional[Stdlib::IP::Address::V6::Nosubnet] $ipv6_gateway,
1617
Optional[Networkmanager::DNS_IPV6] $ipv6_dns,
17-
Optional[String] $ipv6_dhcp_duid,
1818
Integer[0, 3] $ipv6_addr_gen_mode,
1919
Integer[-1, 2] $ipv6_privacy,
2020
Boolean $ipv6_may_fail,
21+
Optional[String] $ipv6_dhcp_duid,
22+
Optional[Stdlib::MAC] $mac_address,
2123
) >> Hash {
2224

2325
$ipv6_method_w = networkmanager::ipv6_disable_version($ipv6_method)

manifests/ifc/bond.pp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,11 @@
106106
$ipv6_address,
107107
$ipv6_gateway,
108108
$ipv6_dns,
109-
$ipv6_dhcp_duid,
110109
$ipv6_addr_gen_mode,
111110
$ipv6_privacy,
112-
$ipv6_may_fail
111+
$ipv6_may_fail,
112+
$ipv6_dhcp_duid,
113+
$mac_address
113114
)
114115

115116
$keyfile_contents = deep_merge(

manifests/ifc/bridge.pp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,11 @@
9393
$ipv6_address,
9494
$ipv6_gateway,
9595
$ipv6_dns,
96-
$ipv6_dhcp_duid,
9796
$ipv6_addr_gen_mode,
9897
$ipv6_privacy,
99-
$ipv6_may_fail
98+
$ipv6_may_fail,
99+
$ipv6_dhcp_duid,
100+
$mac_address
100101
)
101102

102103
$keyfile_contents = deep_merge(

manifests/ifc/connection.pp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,11 @@
103103
$ipv6_address,
104104
$ipv6_gateway,
105105
$ipv6_dns,
106-
$ipv6_dhcp_duid,
107106
$ipv6_addr_gen_mode,
108107
$ipv6_privacy,
109-
$ipv6_may_fail
108+
$ipv6_may_fail,
109+
$ipv6_dhcp_duid,
110+
$mac_address
110111
)
111112

112113
$keyfile_contents = deep_merge(

0 commit comments

Comments
 (0)