Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/328455 )
Change subject: deployment-prep: Fully qualify hostnames
......................................................................
deployment-prep: Fully qualify hostnames
Bug: T153608
Change-Id: Ia32b47d04a8e7112d3aabb5e02207f015f30907e
---
M hieradata/labs.yaml
M hieradata/labs/deployment-prep/common.yaml
M modules/scap/manifests/init.pp
3 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index fd912dc..62b6dcd 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -81,7 +81,7 @@
restbase:
route: eqiad
backends:
- eqiad: 'deployment-restbase01.eqiad.wmflabs'
+ eqiad: 'deployment-restbase01.deployment-prep.eqiad.wmflabs'
cache::upload::apps:
swift:
route: eqiad
diff --git a/hieradata/labs/deployment-prep/common.yaml
b/hieradata/labs/deployment-prep/common.yaml
index 8545355..788e1c5 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -119,7 +119,7 @@
restbase::pdfrender_uri:
http://deployment-pdfrender02.deployment-prep.eqiad.wmflabs:5252
restbase::citoid_uri:
http://deployment-sca02.deployment-prep.eqiad.wmflabs:1970
restbase::trendingedits_uri:
http://deployment-trending01.deployment-prep.eqiad.wmflabs:6699
-"mediawiki::log_aggregator": deployment-fluorine02.eqiad.wmflabs:8420
+"mediawiki::log_aggregator":
deployment-fluorine02.deployment-prep.eqiad.wmflabs:8420
"mediawiki::forward_syslog":
deployment-logstash2.deployment-prep.eqiad.wmflabs:10514
mediawiki_memcached_servers:
- 10.68.23.25:11211:1 # deployment-memc04
@@ -139,7 +139,7 @@
"misc::syslog-server::basepath": /data/project/syslog
"cxserver::apertium": http://apertium-beta.wmflabs.org
role::deployment::mediawiki::key_fingerprint:
f0:54:06:fa:17:27:97:a2:cc:69:a0:a7:df:4c:0a:e3
-"role::deployment::salt_masters::deployment_server":
deployment-tin.eqiad.wmflabs
+"role::deployment::salt_masters::deployment_server":
deployment-tin.deployment-prep.eqiad.wmflabs
"hhvm::extra::fcgi":
hhvm:
pcre_cache_type: lru
diff --git a/modules/scap/manifests/init.pp b/modules/scap/manifests/init.pp
index 38c5972..8461e22 100644
--- a/modules/scap/manifests/init.pp
+++ b/modules/scap/manifests/init.pp
@@ -8,10 +8,10 @@
#
# [*wmflabs_master*]
# Master scap rsync host in the wmflabs domain.
-# Default 'deployment-tin.eqiad.wmflabs'.
+# Default 'deployment-tin.deployment-prep.eqiad.wmflabs'.
class scap (
$deployment_server = 'deployment',
- $wmflabs_master = 'deployment-tin.eqiad.wmflabs',
+ $wmflabs_master = 'deployment-tin.deployment-prep.eqiad.wmflabs',
$version = '3.4.2-1',
) {
package { 'scap':
--
To view, visit https://gerrit.wikimedia.org/r/328455
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia32b47d04a8e7112d3aabb5e02207f015f30907e
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
