[MediaWiki-commits] [Gerrit] operations/puppet[production]: releases/upload: set correct upload server as active_server

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386775 )

Change subject: releases/upload: set correct upload server as active_server
..


releases/upload: set correct upload server as active_server

The upload server used by debupload for uploading releases
should not be hardcoded as "bromine.eqiad.wmnet".

That server is not used anymore. It has been replaced by releases1001
and releases2001.

Set the upload server to the actual "active_server" set in Hiera so
that releases can failover from releases1001 to releases2001 when
needed.

Add class paramater needed for this, use same Hiera lookup as in
releases::mediawiki profile.

Bug: T179134
Change-Id: I679a9b980992104d9306cd90339d2c994bcf1a25
---
M modules/profile/manifests/releases/upload.pp
M modules/releases/manifests/reprepro/upload.pp
2 files changed, 7 insertions(+), 3 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/profile/manifests/releases/upload.pp 
b/modules/profile/manifests/releases/upload.pp
index 30df8e3..2fb07c0 100644
--- a/modules/profile/manifests/releases/upload.pp
+++ b/modules/profile/manifests/releases/upload.pp
@@ -1,3 +1,7 @@
-class profile::releases::upload {
-class { '::releases::reprepro::upload': }
+class profile::releases::upload(
+$active_server = hiera('releases_server'),
+){
+class { '::releases::reprepro::upload':
+upload_host => $active_server,
+}
 }
diff --git a/modules/releases/manifests/reprepro/upload.pp 
b/modules/releases/manifests/reprepro/upload.pp
index a72811b..cc67f30 100644
--- a/modules/releases/manifests/reprepro/upload.pp
+++ b/modules/releases/manifests/reprepro/upload.pp
@@ -6,7 +6,7 @@
 $group= 'releases',
 $sudo_user= '%wikidev',
 $homedir  = '/var/lib/releases',
-$upload_host  = 'bromine.eqiad.wmnet',
+$upload_host  = undef,
 ) {
 group { 'releases':
 ensure => present,

-- 
To view, visit https://gerrit.wikimedia.org/r/386775
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I679a9b980992104d9306cd90339d2c994bcf1a25
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: releases/upload: set correct upload server as active_server

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/386775 )

Change subject: releases/upload: set correct upload server as active_server
..

releases/upload: set correct upload server as active_server

The upload server used by debupload for uploading releases
should not be hardcoded as "bromine.eqiad.wmnet".

That server is not used anymore. It has been replaced by releases1001
and releases2001.

Set the upload server to the actual "active_server" set in Hiera so
that releases can failover from releases1001 to releases2001 when
needed.

Add class paramater needed for this, use same Hiera lookup as in
releases::mediawiki profile.

Bug: T179134
Change-Id: I679a9b980992104d9306cd90339d2c994bcf1a25
---
M modules/profile/manifests/releases/upload.pp
M modules/releases/manifests/reprepro/upload.pp
2 files changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/75/386775/1

diff --git a/modules/profile/manifests/releases/upload.pp 
b/modules/profile/manifests/releases/upload.pp
index 30df8e3..679c489 100644
--- a/modules/profile/manifests/releases/upload.pp
+++ b/modules/profile/manifests/releases/upload.pp
@@ -1,3 +1,7 @@
 class profile::releases::upload {
-class { '::releases::reprepro::upload': }
+$active_server = hiera('releases_server'),
+){
+class { '::releases::reprepro::upload':
+upload_host => $active_server, 
+}
 }
diff --git a/modules/releases/manifests/reprepro/upload.pp 
b/modules/releases/manifests/reprepro/upload.pp
index a72811b..cc67f30 100644
--- a/modules/releases/manifests/reprepro/upload.pp
+++ b/modules/releases/manifests/reprepro/upload.pp
@@ -6,7 +6,7 @@
 $group= 'releases',
 $sudo_user= '%wikidev',
 $homedir  = '/var/lib/releases',
-$upload_host  = 'bromine.eqiad.wmnet',
+$upload_host  = undef,
 ) {
 group { 'releases':
 ensure => present,

-- 
To view, visit https://gerrit.wikimedia.org/r/386775
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I679a9b980992104d9306cd90339d2c994bcf1a25
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