Andrew Bogott has submitted this change and it was merged.
Change subject: Replace generic::sysctl::advanced-routing-ipv6
......................................................................
Replace generic::sysctl::advanced-routing-ipv6
Now use sysctlfile::advanced-routing-ipv6
Change-Id: Iadcf45888e1be6f1faa4e80284d51881b8a3bf50
---
M manifests/generic-definitions.pp
M manifests/role/ipv6relay.pp
A modules/sysctlfile/manifests/advanced-routing-ipv6.pp
3 files changed, 10 insertions(+), 17 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/generic-definitions.pp b/manifests/generic-definitions.pp
index e31c3d4..1b0b077 100644
--- a/manifests/generic-definitions.pp
+++ b/manifests/generic-definitions.pp
@@ -786,22 +786,6 @@
}
}
-class generic::sysctl::advanced-routing-ipv6($ensure="present") {
- if $::lsbdistid == "Ubuntu" and versioncmp($::lsbdistrelease, "10.04")
>= 0 {
- file { advanced-routing-sysctl:
- name => "/etc/sysctl.d/50-advanced-routing-ipv6.conf",
- owner => root,
- group => root,
- mode => 0444,
- notify => Exec["/sbin/start procps"],
- source =>
"puppet:///files/misc/50-advanced-routing-ipv6.conf.sysctl",
- ensure => $ensure
- }
- } else {
- alert("Distribution on $hostname does not support
/etc/sysctl.d/ files yet.")
- }
-}
-
class generic::sysctl::ipv6-disable-ra($ensure="present") {
if $::lsbdistid == "Ubuntu" and versioncmp($::lsbdistrelease, "10.04")
>= 0 {
file { ipv6-disable-ra:
diff --git a/manifests/role/ipv6relay.pp b/manifests/role/ipv6relay.pp
index 48de6fe..07cf332 100644
--- a/manifests/role/ipv6relay.pp
+++ b/manifests/role/ipv6relay.pp
@@ -1,7 +1,7 @@
class role::ipv6relay {
system_role { "role::ipv6relay": description => "IPv6 tunnel relay
(6to4/Teredo)" }
- include generic::sysctl::advanced-routing-ipv6
+ include sysctlfile::advanced-routing-ipv6
# Teredo
include misc::miredo
diff --git a/modules/sysctlfile/manifests/advanced-routing-ipv6.pp
b/modules/sysctlfile/manifests/advanced-routing-ipv6.pp
new file mode 100644
index 0000000..1c38eb9
--- /dev/null
+++ b/modules/sysctlfile/manifests/advanced-routing-ipv6.pp
@@ -0,0 +1,9 @@
+# sysctl values for advanced routing ipv6
+class sysctlfile::advanced-routing-ipv6($ensure="present") {
+ sysctlfile {'advanced-routing-ipv6':
+ source => 'puppet:///modules/sysctlfile/50-advanced-routing-ipv6.conf',
+ number_prefix => '50',
+ ensure => $ensure,
+ notify => Exec["/sbin/start procps"],
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/74798
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iadcf45888e1be6f1faa4e80284d51881b8a3bf50
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Lcarr <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
