Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/351564 )
Change subject: gerrit: move hiera lookup to profile parameter
......................................................................
gerrit: move hiera lookup to profile parameter
The new puppet coding guidelines say that Hiera
lookups should only be in profile parameters and
not in the middle of a manifest.
Change-Id: I1c1ca9cbf9d270423652d3c437841d7ca908e740
---
M modules/profile/manifests/gerrit/server.pp
1 file changed, 6 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/profile/manifests/gerrit/server.pp
b/modules/profile/manifests/gerrit/server.pp
index b032d85..76bbaf4 100644
--- a/modules/profile/manifests/gerrit/server.pp
+++ b/modules/profile/manifests/gerrit/server.pp
@@ -7,6 +7,7 @@
$host = hiera('gerrit::server::host'),
$master_host = hiera('gerrit::server::master_host'),
$bacula = hiera('gerrit::server::bacula'),
+ $gerrit_servers = join(hiera('gerrit::servers'), ' ')
) {
interface::ip { 'role::gerrit::server_ipv4':
@@ -41,17 +42,17 @@
include ::base::firewall
- ferm::service { 'gerrit_ssh':
+ # ssh from users to gerrit
+ ferm::service { 'gerrit_ssh_users':
proto => 'tcp',
port => '29418',
}
- # ssh between gerrit servers for clustering support
- $gerrit_servers_ferm = join(hiera('gerrit::servers'), ' ')
- ferm::service { 'ssh_gerrit_cluster':
+ # ssh between gerrit servers for cluster support
+ ferm::service { 'gerrit_ssh_cluster':
port => '22',
proto => 'tcp',
- srange => "(@resolve((${gerrit_servers_ferm}))
@resolve((${gerrit_servers_ferm}), AAAA))",
+ srange => "(@resolve((${gerrit_servers}))
@resolve((${gerrit_servers}), AAAA))",
}
if !$slave {
--
To view, visit https://gerrit.wikimedia.org/r/351564
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1c1ca9cbf9d270423652d3c437841d7ca908e740
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
