Muehlenhoff has submitted this change and it was merged.
Change subject: Move base::firewall into the archiva role
......................................................................
Move base::firewall into the archiva role
Change-Id: I87c7c9304690ba426e74d6084f8995e6be5b7602
---
M manifests/role/archiva.pp
M manifests/site.pp
2 files changed, 2 insertions(+), 1 deletion(-)
Approvals:
Muehlenhoff: Verified; Looks good to me, approved
diff --git a/manifests/role/archiva.pp b/manifests/role/archiva.pp
index d02cd00..894a7bc 100644
--- a/manifests/role/archiva.pp
+++ b/manifests/role/archiva.pp
@@ -7,6 +7,8 @@
class role::archiva {
system::role { 'role::archiva': description => 'Apache Archiva Host' }
+ include base::firewall
+
if !defined(Package['openjdk-7-jdk']) {
package { 'openjdk-7-jdk':
ensure => 'installed',
diff --git a/manifests/site.pp b/manifests/site.pp
index 83f3167..79b4b75 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2437,7 +2437,6 @@
$cluster = 'misc'
# include firewall here, until it is on all hosts
role archiva
- include base::firewall
include standard
}
--
To view, visit https://gerrit.wikimedia.org/r/245974
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I87c7c9304690ba426e74d6084f8995e6be5b7602
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
