ArielGlenn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391221 )
Change subject: move base::firewall out of dumps/snapshots modules and into
roles
......................................................................
move base::firewall out of dumps/snapshots modules and into roles
AND use the new profile:: prefix, thanks jynus!
Change-Id: Ib87831d1f646d3cb46412cdef3246316a29b9b22
---
M modules/dumps/manifests/nfs.pp
M modules/dumps/manifests/web/xmldumps.pp
M modules/role/manifests/dumps/generation/server/fallback.pp
M modules/role/manifests/dumps/generation/server/primary.pp
M modules/role/manifests/dumps/generation/worker/dumper.pp
M modules/role/manifests/dumps/generation/worker/dumper_misc.pp
M modules/role/manifests/dumps/generation/worker/testbed.pp
M modules/role/manifests/dumps/web/htmldumps.pp
M modules/role/manifests/dumps/web/xmldumps_active.pp
M modules/role/manifests/dumps/web/xmldumps_fallback.pp
10 files changed, 8 insertions(+), 7 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/dumps/manifests/nfs.pp b/modules/dumps/manifests/nfs.pp
index 21d6990..66770aa 100644
--- a/modules/dumps/manifests/nfs.pp
+++ b/modules/dumps/manifests/nfs.pp
@@ -47,7 +47,6 @@
options => "nlm_udpport=${lockd_udp} nlm_tcpport=${lockd_tcp}",
}
- include ::base::firewall
include ::network::constants
ferm::service { 'dumps_nfs':
diff --git a/modules/dumps/manifests/web/xmldumps.pp
b/modules/dumps/manifests/web/xmldumps.pp
index fd5358e..5e1d1e1 100644
--- a/modules/dumps/manifests/web/xmldumps.pp
+++ b/modules/dumps/manifests/web/xmldumps.pp
@@ -42,8 +42,6 @@
mode => '0444',
}
- include ::base::firewall
-
ferm::service { 'xmldumps_http':
proto => 'tcp',
port => '80',
diff --git a/modules/role/manifests/dumps/generation/server/fallback.pp
b/modules/role/manifests/dumps/generation/server/fallback.pp
index 925edf3..d16d8a4 100644
--- a/modules/role/manifests/dumps/generation/server/fallback.pp
+++ b/modules/role/manifests/dumps/generation/server/fallback.pp
@@ -2,6 +2,7 @@
system::role { 'dumps::generation::server': description => 'Fallback NFS
server of dumps generation filesystem to dumps producer hosts' }
include ::standard
+ include ::profile::base::firewall
include ::profile::dumps::generation::server::fallback
include ::profile::dumps::generation::server::rsync
include ::profile::dumps::rsyncer_peer
diff --git a/modules/role/manifests/dumps/generation/server/primary.pp
b/modules/role/manifests/dumps/generation/server/primary.pp
index 600e8ba..c5939f8 100644
--- a/modules/role/manifests/dumps/generation/server/primary.pp
+++ b/modules/role/manifests/dumps/generation/server/primary.pp
@@ -2,6 +2,7 @@
system::role { 'dumps::generation::server': description => 'Primary NFS
server of dumps generation filesystem to dumps producer hosts' }
include ::standard
+ include ::profile::base::firewall
include ::profile::dumps::generation::server::primary
include ::profile::dumps::nfs::generation
}
diff --git a/modules/role/manifests/dumps/generation/worker/dumper.pp
b/modules/role/manifests/dumps/generation/worker/dumper.pp
index 3fd106e..2bb1791 100644
--- a/modules/role/manifests/dumps/generation/worker/dumper.pp
+++ b/modules/role/manifests/dumps/generation/worker/dumper.pp
@@ -1,6 +1,6 @@
class role::dumps::generation::worker::dumper {
include standard
- include ::base::firewall
+ include ::profile::base::firewall
include profile::dumps::generation::worker::common
include profile::dumps::generation::worker::dumper
diff --git a/modules/role/manifests/dumps/generation/worker/dumper_misc.pp
b/modules/role/manifests/dumps/generation/worker/dumper_misc.pp
index ae763f1..01c9667 100644
--- a/modules/role/manifests/dumps/generation/worker/dumper_misc.pp
+++ b/modules/role/manifests/dumps/generation/worker/dumper_misc.pp
@@ -1,6 +1,6 @@
class role::dumps::generation::worker::dumper_misc {
include standard
- include ::base::firewall
+ include ::profile::base::firewall
include profile::dumps::generation::worker::common
include profile::dumps::generation::worker::dumper
diff --git a/modules/role/manifests/dumps/generation/worker/testbed.pp
b/modules/role/manifests/dumps/generation/worker/testbed.pp
index b1647e8..d2a9118 100644
--- a/modules/role/manifests/dumps/generation/worker/testbed.pp
+++ b/modules/role/manifests/dumps/generation/worker/testbed.pp
@@ -1,6 +1,6 @@
class role::dumps::generation::worker::testbed {
include standard
- include ::base::firewall
+ include ::profile::base::firewall
include profile::dumps::generation::worker::common
diff --git a/modules/role/manifests/dumps/web/htmldumps.pp
b/modules/role/manifests/dumps/web/htmldumps.pp
index a3aa78e..5a44ec7 100644
--- a/modules/role/manifests/dumps/web/htmldumps.pp
+++ b/modules/role/manifests/dumps/web/htmldumps.pp
@@ -5,7 +5,7 @@
include ::standard
include ::profile::dumps::web::htmldumps
- include ::base::firewall
+ include ::profile::base::firewall
ferm::service { 'html_dumps_http':
proto => 'tcp',
diff --git a/modules/role/manifests/dumps/web/xmldumps_active.pp
b/modules/role/manifests/dumps/web/xmldumps_active.pp
index a4880b4..88f2693 100644
--- a/modules/role/manifests/dumps/web/xmldumps_active.pp
+++ b/modules/role/manifests/dumps/web/xmldumps_active.pp
@@ -3,6 +3,7 @@
# lastly, serves thse files via nfs to certain internal hosts
class role::dumps::web::xmldumps_active {
include ::standard
+ include ::profile::base::firewall
include ::profile::dumps::web::xmldumps_active
include ::profile::dumps::web::rsync_server
include ::profile::dumps::rsyncer
diff --git a/modules/role/manifests/dumps/web/xmldumps_fallback.pp
b/modules/role/manifests/dumps/web/xmldumps_fallback.pp
index 80dbd35..bb4f482 100644
--- a/modules/role/manifests/dumps/web/xmldumps_fallback.pp
+++ b/modules/role/manifests/dumps/web/xmldumps_fallback.pp
@@ -3,6 +3,7 @@
# lastly, serves thse files via nfs to certain internal hosts
class role::dumps::web::xmldumps_fallback {
include ::standard
+ include ::profile::base::firewall
include ::profile::dumps::web::xmldumps_fallback
include ::profile::dumps::web::rsync_server
include ::profile::dumps::rsyncer_peer
--
To view, visit https://gerrit.wikimedia.org/r/391221
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib87831d1f646d3cb46412cdef3246316a29b9b22
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
