Faidon Liambotis has submitted this change and it was merged.
Change subject: interface: do not 'ensure latest', use require_package
......................................................................
interface: do not 'ensure latest', use require_package
Do not let Puppet automatically update these fundamental
networking-related packages. While at it, use require_package and drop
the singleton classes.
Bug: T115348
Change-Id: Ifa690317111326841bca1376cc7e1fcfd08ab639
---
M modules/interface/manifests/aggregate.pp
M modules/interface/manifests/tagged.pp
2 files changed, 3 insertions(+), 16 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/interface/manifests/aggregate.pp
b/modules/interface/manifests/aggregate.pp
index 089f9a4..ddd0795 100644
--- a/modules/interface/manifests/aggregate.pp
+++ b/modules/interface/manifests/aggregate.pp
@@ -1,5 +1,5 @@
define interface::aggregate_member($master) {
- require interface::bonding-tools
+ require_package('ifenslave-2.6')
$interface = $title
@@ -22,7 +22,7 @@
}
define interface::aggregate($orig_interface=undef, $members=[],
$lacp_rate='fast', $hash_policy='layer2+3') {
- require interface::bonding-tools
+ require_package('ifenslave-2.6')
# Use the definition title as the destination (aggregated) interface
$aggr_interface = $title
@@ -83,12 +83,5 @@
command => "/sbin/ifup --force ${aggr_interface}",
require => Interface::Aggregate_member[$members],
refreshonly => true
- }
-}
-
-class interface::bonding-tools {
- # ethtool is also needed but is included from base
- package { ['ifenslave-2.6', ]:
- ensure => latest,
}
}
diff --git a/modules/interface/manifests/tagged.pp
b/modules/interface/manifests/tagged.pp
index cbdbcd4..d8be308 100644
--- a/modules/interface/manifests/tagged.pp
+++ b/modules/interface/manifests/tagged.pp
@@ -1,11 +1,5 @@
-class interface::vlan-tools {
- package { 'vlan':
- ensure => latest,
- }
-}
-
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
+ require_package('vlan')
$intf = "${base_interface}.${vlan_id}"
--
To view, visit https://gerrit.wikimedia.org/r/247008
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa690317111326841bca1376cc7e1fcfd08ab639
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
