Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188524
Change subject: ganglia_new: move ferm::service from module to role
......................................................................
ganglia_new: move ferm::service from module to role
ferm rules should be at the role level and not the module level
Change-Id: I83265bf90a95007e16dd5be34a6cb111045a02ed
---
M manifests/role/ganglia.pp
M modules/ganglia_new/manifests/web.pp
2 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/24/188524/1
diff --git a/manifests/role/ganglia.pp b/manifests/role/ganglia.pp
index 69f9b84..f90ea48 100644
--- a/manifests/role/ganglia.pp
+++ b/manifests/role/ganglia.pp
@@ -91,6 +91,16 @@
gmetad_root => $gmetad_root,
}
+ ferm::service { 'ganglia_http':
+ proto => 'tcp',
+ port => '80',
+ }
+
+ ferm::service { 'ganglia_https':
+ proto => 'tcp',
+ port => '443',
+ }
+
# Get better insight into how disks are faring
ganglia::plugin::python { 'diskstat': }
diff --git a/modules/ganglia_new/manifests/web.pp
b/modules/ganglia_new/manifests/web.pp
index e3a790b..5ce4a34 100644
--- a/modules/ganglia_new/manifests/web.pp
+++ b/modules/ganglia_new/manifests/web.pp
@@ -37,14 +37,4 @@
content => template('ganglia_new/conf_production.php.erb'),
require => Package['ganglia-webfrontend'],
}
-
- ferm::service { 'ganglia_http':
- proto => 'tcp',
- port => '80',
- }
-
- ferm::service { 'ganglia_https':
- proto => 'tcp',
- port => '443',
- }
}
--
To view, visit https://gerrit.wikimedia.org/r/188524
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I83265bf90a95007e16dd5be34a6cb111045a02ed
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
