Andrew Bogott has submitted this change and it was merged.
Change subject: Replace generic::sysctl::ipv6-disable-ra
......................................................................
Replace generic::sysctl::ipv6-disable-ra
Now use sysctlfile::ipv6-disable-ra
Change-Id: I831348bba980f85d916eb116a8bdd36c3e300f0e
---
M manifests/generic-definitions.pp
M manifests/openstack.pp
A modules/sysctlfile/manifests/ipv6-disable-ra.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 fb71c00..1272cd8 100644
--- a/manifests/generic-definitions.pp
+++ b/manifests/generic-definitions.pp
@@ -786,22 +786,6 @@
}
}
-class generic::sysctl::ipv6-disable-ra($ensure="present") {
- if $::lsbdistid == "Ubuntu" and versioncmp($::lsbdistrelease, "10.04")
>= 0 {
- file { ipv6-disable-ra:
- name => "/etc/sysctl.d/50-ipv6-disable-ra.conf",
- owner => root,
- group => root,
- mode => 0444,
- notify => Exec["/sbin/start procps"],
- source =>
"puppet:///files/misc/50-ipv6-disable-ra.conf.sysctl",
- ensure => $ensure
- }
- } else {
- alert("Distribution on $hostname does not support
/etc/sysctl.d/ files yet.")
- }
-}
-
class generic::sysctl::lvs($ensure="present") {
if $::lsbdistid == "Ubuntu" and versioncmp($::lsbdistrelease, "10.04")
>= 0 {
file { lvs-sysctl:
diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index 96201f5..d4c28f9 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -588,7 +588,7 @@
# Enable IP forwarding
include sysctlfile::advanced-routing,
- generic::sysctl::ipv6-disable-ra
+ sysctlfile::ipv6-disable-ra
}
class openstack::api-service($openstack_version="essex", $novaconfig) {
diff --git a/modules/sysctlfile/manifests/ipv6-disable-ra.pp
b/modules/sysctlfile/manifests/ipv6-disable-ra.pp
new file mode 100644
index 0000000..9a67345
--- /dev/null
+++ b/modules/sysctlfile/manifests/ipv6-disable-ra.pp
@@ -0,0 +1,9 @@
+# sysctl values for ipv6-disable-ra
+class sysctlfile::ipv6-disable-ra($ensure="present") {
+ sysctlfile {'ipv6-disable-ra':
+ source => 'puppet:///modules/sysctlfile/50-ipv6-disable-ra.conf',
+ number_prefix => '50',
+ ensure => $ensure,
+ notify => Exec["/sbin/start procps"],
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/74799
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I831348bba980f85d916eb116a8bdd36c3e300f0e
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
