BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/355219 )
Change subject: RPS cleanup 5/5: use new config file in puppet
......................................................................
RPS cleanup 5/5: use new config file in puppet
This allows future puppet usage of interface::rps to use
$rss_pattern again if warranted, via the config file, and also
sets up the class to automatically re-execute interface-rps on
relevant config and/or code changes.
Change-Id: Iad4a8522b74e05762164064c555200451fd5c2a8
---
M modules/interface/manifests/rps.pp
M modules/interface/manifests/rpstools.pp
A modules/interface/templates/interface-rps-config.erb
3 files changed, 22 insertions(+), 7 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/interface/manifests/rps.pp
b/modules/interface/manifests/rps.pp
index 0ea60f4..afe6c85 100644
--- a/modules/interface/manifests/rps.pp
+++ b/modules/interface/manifests/rps.pp
@@ -11,11 +11,14 @@
require interface::rpstools
require interface::rps::modparams
- if $rss_pattern != '' {
- $cmd = "/usr/local/sbin/interface-rps ${interface} ${rss_pattern}"
- }
- else {
- $cmd = "/usr/local/sbin/interface-rps ${interface}"
+ $cmd = "/usr/local/sbin/interface-rps ${interface}"
+ $cfg = "/etc/interface-rps.d/${interface}"
+
+ file { $cfg:
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ content => template("${module_name}/interface-rps-config.erb"),
}
# Add to ifup commands in /etc/network/interfaces
@@ -24,11 +27,14 @@
command => $cmd,
}
- # Exec immediately if newly-added
+ # Exec immediately on script or config change
exec { "rps-${interface}":
command => $cmd,
- subscribe => Augeas["${interface}_rps-${interface}"],
refreshonly => true,
+ subscribe => [
+ File['/usr/local/sbin/interface-rps'],
+ File[$cfg],
+ ],
}
}
diff --git a/modules/interface/manifests/rpstools.pp
b/modules/interface/manifests/rpstools.pp
index b8c4ce3..50b547c0 100644
--- a/modules/interface/manifests/rpstools.pp
+++ b/modules/interface/manifests/rpstools.pp
@@ -12,4 +12,11 @@
mode => '0555',
source => 'puppet:///modules/interface/interface-rps.py',
}
+
+ file { '/etc/interface-rps.d':
+ ensure => directory,
+ owner => 'root',
+ group => 'root',
+ mode => '0755',
+ }
}
diff --git a/modules/interface/templates/interface-rps-config.erb
b/modules/interface/templates/interface-rps-config.erb
new file mode 100644
index 0000000..8f66cd3
--- /dev/null
+++ b/modules/interface/templates/interface-rps-config.erb
@@ -0,0 +1,2 @@
+[Options]
+<% if @rss_pattern != '' %>rss_pattern = <%= @rss_pattern %><% end %>
--
To view, visit https://gerrit.wikimedia.org/r/355219
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iad4a8522b74e05762164064c555200451fd5c2a8
Gerrit-PatchSet: 4
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
