Mark Bergsma has submitted this change and it was merged.
Change subject: Cleanup, migrate the remaining interface_* stuff out of
generic-definitions
......................................................................
Cleanup, migrate the remaining interface_* stuff out of generic-definitions
Change-Id: I6f0eabc40f2ea6c003e2047f086fc8210a7f987d
---
M manifests/generic-definitions.pp
A modules/interface/manifests/up_command.pp
2 files changed, 10 insertions(+), 25 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/generic-definitions.pp b/manifests/generic-definitions.pp
index 20ab1e4..252fd89 100644
--- a/manifests/generic-definitions.pp
+++ b/manifests/generic-definitions.pp
@@ -179,31 +179,6 @@
}
}
-# WARNING: This function is deprecated, and code will soon be switched
-# over to the new 'interface' module. Until that cut happens
-# THIS CLASS IS FROZEN.
-define interface_up_command($interface, $command) {
- if $::lsbdistid == "Ubuntu" and versioncmp($::lsbdistrelease, "10.04")
>= 0 {
- # Use augeas to add an 'up' command to the interface
- augeas { "${interface}_${title}":
- context => "/files/etc/network/interfaces/*[. =
'${interface}']",
- changes => "set up[last()+1] '${command}'",
- onlyif => "match up[. = '${command}'] size == 0";
- }
- }
-}
-
-class base::vlan-tools {
- package { vlan: ensure => latest; }
-}
-
-# WARNING: This function is deprecated, and code will soon be switched
-# over to the new 'interface' module. Until that cut happens
-# THIS CLASS IS FROZEN.
-class base::bonding-tools {
- package { ["ifenslave-2.6", "ethtool"] : ensure => latest; }
-}
-
class base::mwclient {
package { python-mwclient: ensure => latest; }
}
diff --git a/modules/interface/manifests/up_command.pp
b/modules/interface/manifests/up_command.pp
new file mode 100644
index 0000000..aeda32a
--- /dev/null
+++ b/modules/interface/manifests/up_command.pp
@@ -0,0 +1,10 @@
+define interface::up_command($interface, $command) {
+ if $::lsbdistid == "Ubuntu" and versioncmp($::lsbdistrelease, "10.04")
>= 0 {
+ # Use augeas to add an 'up' command to the interface
+ augeas { "${interface}_${title}":
+ context => "/files/etc/network/interfaces/*[. =
'${interface}']",
+ changes => "set up[last()+1] '${command}'",
+ onlyif => "match up[. = '${command}'] size == 0";
+ }
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/77115
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6f0eabc40f2ea6c003e2047f086fc8210a7f987d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
