Chad has uploaded a new change for review.
https://gerrit.wikimedia.org/r/296682
Change subject: Gerrit: don't pass SMTP server info around either, it's in hiera
......................................................................
Gerrit: don't pass SMTP server info around either, it's in hiera
Change-Id: I5d7725d73fb9a3f834521830aa9dc6603375958d
---
M modules/gerrit/manifests/init.pp
M modules/gerrit/manifests/jetty.pp
M modules/gerrit/templates/gerrit.config.erb
M modules/role/manifests/gerrit/production.pp
4 files changed, 2 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/82/296682/1
diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index 8ba9bbf..65756a7 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -2,13 +2,11 @@
class gerrit(
$host,
- $replication = '',
- $smtp_host = ''
+ $replication = ''
) {
class { 'gerrit::jetty':
replication => $replication,
- smtp_host => $smtp_host,
}
class { 'gerrit::proxy':
diff --git a/modules/gerrit/manifests/jetty.pp
b/modules/gerrit/manifests/jetty.pp
index 73d0aaf..c120542 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -1,7 +1,6 @@
class gerrit::jetty(
$db_host,
$replication,
- $smtp_host,
$ssh_key,
$url = "https://${::gerrit::host}/r";,
$db_name = 'reviewdb',
diff --git a/modules/gerrit/templates/gerrit.config.erb
b/modules/gerrit/templates/gerrit.config.erb
index 0c517fb..aacf4bb 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -29,11 +29,7 @@
[sendemail]
includeDiff = true
smtpServerPort = 25
-<% if @smtp_host != "" then %>
- smtpServer = <%= @smtp_host %>
-<% else %>
- enable = false
-<% end %>
+ smtpServer = <%= @mail_smarthost[0] %>
[container]
user = gerrit2
javaHome = /usr/lib/jvm/java-7-openjdk-amd64/jre
diff --git a/modules/role/manifests/gerrit/production.pp
b/modules/role/manifests/gerrit/production.pp
index 8d270e2..8a0e30c 100644
--- a/modules/role/manifests/gerrit/production.pp
+++ b/modules/role/manifests/gerrit/production.pp
@@ -46,7 +46,6 @@
class { '::gerrit':
host => $host,
- smtp_host => $::mail_smarthost[0],
replication => {
# If adding a new entry, remember to add the fingerprint to
gerrit2's known_hosts
'github' => {
--
To view, visit https://gerrit.wikimedia.org/r/296682
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d7725d73fb9a3f834521830aa9dc6603375958d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <ch...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
