BBlack has submitted this change and it was merged.
Change subject: Revert v6 tokens for interface::tagged
......................................................................
Revert v6 tokens for interface::tagged
This was only ever deployed/tested on trusty LVS in codfw, and
it's not actually necessary or useful in the real world.
Revert "fix quoting in token stuff"
This reverts commit 0a77f80decebe260d3500837913d8c3aa5485b95.
Revert "use regsubst instead of inline_template"
This reverts commit 99a6a1145b4e355e5e13efb73babf9a8d133664b.
Revert "perhaps @var will work"
This reverts commit ab33cc177c0769d6e6123c9ad3b34c55d5f5198c.
Revert "apparently no string interp for inline_template?"
This reverts commit 8429169120e31e00d243eeb3e0b7800576c84b8a.
Revert "use v6 SLAAC tokens for interface::tagged, optionally"
This reverts commit de3aa3d8c54520ec5ae92de4731421641b7d5014.
Change-Id: Idd0fc78566fc9e1330b5d5f2767bc825fda7c10a
---
M manifests/site.pp
M modules/interface/manifests/tagged.pp
2 files changed, 1 insertion(+), 20 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 83dadaa..11bcabe 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1507,7 +1507,6 @@
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':
@@ -1515,14 +1514,12 @@
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]$/: {
@@ -1532,7 +1529,6 @@
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':
@@ -1540,14 +1536,12 @@
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,
}
}
}
@@ -1558,14 +1552,12 @@
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
@@ -1574,14 +1566,12 @@
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 4c38756..1ed072d 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,
$v6_token=false, $remove=undef) {
+define interface::tagged($base_interface, $vlan_id, $address=undef,
$netmask=undef, $family='inet', $method='static', $up=undef, $down=undef,
$remove=undef) {
require interface::vlan-tools
$intf = "${base_interface}.${vlan_id}"
@@ -32,14 +32,6 @@
$down_cmd = ''
}
- if $v6_token {
- $v6_token_lower64 = regsubst($address, '\.', ':', 'G')
- $v6_token_addr = "::${v6_token_lower64}"
- $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}']"
@@ -52,7 +44,6 @@
$addr_cmd,
$netmask_cmd,
$up_cmd,
- $v6_token_cmd,
$down_cmd,
]
}
--
To view, visit https://gerrit.wikimedia.org/r/214372
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idd0fc78566fc9e1330b5d5f2767bc825fda7c10a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
