BBlack has submitted this change and it was merged.
Change subject: use v6 SLAAC tokens for interface::tagged, optionally
......................................................................
use v6 SLAAC tokens for interface::tagged, optionally
Change-Id: I6bf11218e4df587d48bd9f1cd673fdad927d7dfe
---
M manifests/site.pp
M modules/interface/manifests/tagged.pp
2 files changed, 19 insertions(+), 1 deletion(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 0b3f257..ba27c9f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1777,6 +1777,7 @@
vlan_id => '2001',
address => $ips['public1-a-codfw'][$::hostname],
netmask => '255.255.255.224',
+ v6_token => true,
}
# Row B subnets on eth1
interface::tagged { 'eth1.2002':
@@ -1784,12 +1785,14 @@
vlan_id => '2002',
address => $ips['public1-b-codfw'][$::hostname],
netmask => '255.255.255.224',
+ v6_token => true,
}
interface::tagged { 'eth1.2018':
base_interface => 'eth1',
vlan_id => '2018',
address => $ips['private1-b-codfw'][$::hostname],
netmask => '255.255.252.0',
+ v6_token => true,
}
}
/^lvs200[4-6]$/: {
@@ -1799,6 +1802,7 @@
vlan_id => '2002',
address => $ips['public1-b-codfw'][$::hostname],
netmask => '255.255.255.224',
+ v6_token => true,
}
# Row A subnets on eth1
interface::tagged { 'eth1.2001':
@@ -1806,12 +1810,14 @@
vlan_id => '2001',
address => $ips['public1-a-codfw'][$::hostname],
netmask => '255.255.255.224',
+ v6_token => true,
}
interface::tagged { 'eth1.2017':
base_interface => 'eth1',
vlan_id => '2017',
address => $ips['private1-a-codfw'][$::hostname],
netmask => '255.255.252.0',
+ v6_token => true,
}
}
}
@@ -1822,12 +1828,14 @@
vlan_id => '2003',
address => $ips['public1-c-codfw'][$::hostname],
netmask => '255.255.255.224',
+ v6_token => true,
}
interface::tagged { 'eth2.2019':
base_interface => 'eth2',
vlan_id => '2019',
address => $ips['private1-c-codfw'][$::hostname],
netmask => '255.255.252.0',
+ v6_token => true,
}
# Row D subnets on eth3
@@ -1836,12 +1844,14 @@
vlan_id => '2004',
address => $ips['public1-d-codfw'][$::hostname],
netmask => '255.255.255.224',
+ v6_token => true,
}
interface::tagged { 'eth3.2020':
base_interface => 'eth3',
vlan_id => '2020',
address => $ips['private1-d-codfw'][$::hostname],
netmask => '255.255.252.0',
+ v6_token => true,
}
lvs::interface-tweaks {
diff --git a/modules/interface/manifests/tagged.pp
b/modules/interface/manifests/tagged.pp
index 495820f..4a40ab9 100644
--- a/modules/interface/manifests/tagged.pp
+++ b/modules/interface/manifests/tagged.pp
@@ -4,7 +4,7 @@
}
}
-define interface::tagged($base_interface, $vlan_id, $address=undef,
$netmask=undef, $family='inet', $method='static', $up=undef, $down=undef,
$remove=undef) {
+define interface::tagged($base_interface, $vlan_id, $address=undef,
$netmask=undef, $family='inet', $method='static', $up=undef, $down=undef,
$v6_token=false, $remove=undef) {
require interface::vlan-tools
$intf = "${base_interface}.${vlan_id}"
@@ -32,6 +32,13 @@
$down_cmd = ''
}
+ if $v6_token {
+ $v6_token_addr = inline_template("::<%= ${address}.gsub('.', ':') %>")
+ $v6_token_cmd = "set iface[. = '${intf}']/up /sbin/ip token set
'${v6_token_addr}' dev '${intf}'"
+ } else {
+ $v6_token_cmd = ''
+ }
+
if $remove == 'true' {
$augeas_cmd = [ "rm auto[./1 = '${intf}']",
"rm iface[. = '${intf}']"
@@ -44,6 +51,7 @@
$addr_cmd,
$netmask_cmd,
$up_cmd,
+ $v6_token_cmd,
$down_cmd,
]
}
--
To view, visit https://gerrit.wikimedia.org/r/161106
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6bf11218e4df587d48bd9f1cd673fdad927d7dfe
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
