Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354075 )
Change subject: gerrit: rename "server" IP to "service" IP
..
gerrit: rename "server" IP to "service" IP
Because that's what this is, a service IP, NOT the server IP.
Rename the variables to make this less confusing.
Change-Id: I26d3afe502e3b0080a3e87c1d3a1c422cc858fc7
---
M hieradata/role/codfw/gerrit/server.yaml
M hieradata/role/eqiad/gerrit/server.yaml
M modules/gerrit/templates/gerrit.config.erb
M modules/profile/manifests/gerrit/server.pp
4 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/75/354075/1
diff --git a/hieradata/role/codfw/gerrit/server.yaml
b/hieradata/role/codfw/gerrit/server.yaml
index e0aca96..e5b7adb 100644
--- a/hieradata/role/codfw/gerrit/server.yaml
+++ b/hieradata/role/codfw/gerrit/server.yaml
@@ -1,3 +1,3 @@
gerrit::jetty::db_host: 'm2-master.codfw.wmnet'
-profile::gerrit::server::ipv4: '208.80.153.107'
-profile::gerrit::server::ipv6: '2620:0:860:4:208:80:153:107'
+profile::gerrit::service::ipv4: '208.80.153.107'
+profile::gerrit::service::ipv6: '2620:0:860:4:208:80:153:107'
diff --git a/hieradata/role/eqiad/gerrit/server.yaml
b/hieradata/role/eqiad/gerrit/server.yaml
index 1e8e0d8..72c4020 100644
--- a/hieradata/role/eqiad/gerrit/server.yaml
+++ b/hieradata/role/eqiad/gerrit/server.yaml
@@ -1,3 +1,3 @@
gerrit::jetty::db_host: 'm2-master.eqiad.wmnet'
-profile::gerrit::server::ipv4: '208.80.154.85'
-profile::gerrit::server::ipv6: '2620:0:861:3:208:80:154:85'
+profile::gerrit::service::ipv4: '208.80.154.85'
+profile::gerrit::service::ipv6: '2620:0:861:3:208:80:154:85'
diff --git a/modules/gerrit/templates/gerrit.config.erb
b/modules/gerrit/templates/gerrit.config.erb
index 0d28692..6c32e3f 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -164,7 +164,7 @@
connectTimeout = 1 min
smtpServer = <%= @mail_smarthost[0] %>
[sshd]
-listenAddress = <%= @profile::gerrit::server::ipv4 %>:29418 <%=
@profile::gerrit::server::ipv6 %>:29418
+listenAddress = <%= @profile::gerrit::service::ipv4 %>:29418 <%=
@profile::gerrit::service::ipv6 %>:29418
threads = 8
batchThreads = 2
idleTimeout = 864000
diff --git a/modules/profile/manifests/gerrit/server.pp
b/modules/profile/manifests/gerrit/server.pp
index 1fcfeb4..7ef290b 100644
--- a/modules/profile/manifests/gerrit/server.pp
+++ b/modules/profile/manifests/gerrit/server.pp
@@ -2,8 +2,8 @@
#
# filtertags: labs-project-git labs-project-ci-staging
class profile::gerrit::server(
-$ipv4 = hiera('gerrit::server::ipv4'),
-$ipv6 = hiera('gerrit::server::ipv6'),
+$ipv4 = hiera('gerrit::service::ipv4'),
+$ipv6 = hiera('gerrit::service::ipv6'),
$host = hiera('gerrit::server::host'),
$master_host = hiera('gerrit::server::master_host'),
$bacula = hiera('gerrit::server::bacula'),
--
To view, visit https://gerrit.wikimedia.org/r/354075
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I26d3afe502e3b0080a3e87c1d3a1c422cc858fc7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
