Andrew Bogott has submitted this change and it was merged.
Change subject: Remove labtest realm checks from wikitech configs
......................................................................
Remove labtest realm checks from wikitech configs
Bug: T148717
Change-Id: Ie99005924694190b631d34981c6aad65701bc833
---
M hieradata/eqiad.yaml
M hieradata/regex.yaml
M modules/openstack/manifests/openstack_manager.pp
M modules/role/manifests/labs/openstack/nova/manager.pp
4 files changed, 48 insertions(+), 60 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index 212275b..4f05197 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -134,6 +134,8 @@
- labvirt1012
- labvirt1013
+wikitech_db_name: 'labswiki'
+
wikitechstatusconfig:
host: 'wikitech.wikimedia.org'
domain: 'labs'
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index baa3ec2..132f323 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -395,6 +395,8 @@
labs_glance_controller: &labsglancecontroller
"labtestcontrol2001.wikimedia.org"
labs_puppet_master: &labspuppetmaster "labtestcontrol2001.wikimedia.org"
labs_keystone_host: &labskeystonehost "labtestcontrol2001.wikimedia.org"
+ wikitech_use_letsencrypt: true
+ wikitech_db_name: 'labtestwiki'
labsldapconfig:
hostname: labtestservices2001.wikimedia.org
secondary_hostname: labtestservices2001.wikimedia.org
diff --git a/modules/openstack/manifests/openstack_manager.pp
b/modules/openstack/manifests/openstack_manager.pp
index 244cebc..db3c0cd 100644
--- a/modules/openstack/manifests/openstack_manager.pp
+++ b/modules/openstack/manifests/openstack_manager.pp
@@ -116,46 +116,37 @@
target => '/srv/mediawiki';
}
- case $::realm {
- 'production': {
- $wikidb = 'labswiki'
-
- cron {
- 'db-bak':
- ensure => present,
- user => 'root',
- hour => 1,
- minute => 0,
- command => '/usr/local/sbin/db-bak.sh > /dev/null 2>&1',
- require => File['/a/backup'];
- 'mw-xml':
- ensure => present,
- user => 'root',
- hour => 1,
- minute => 30,
- command => '/usr/local/sbin/mw-xml.sh > /dev/null 2>&1',
- require => File['/a/backup'];
- 'mw-files':
- ensure => present,
- user => 'root',
- hour => 2,
- minute => 0,
- command => '/usr/local/sbin/mw-files.sh > /dev/null 2>&1',
- require => File['/a/backup'];
- 'backup-cleanup':
- ensure => present,
- user => 'root',
- hour => 3,
- minute => 0,
- command => 'find /a/backup -type f -mtime +4 -delete',
- require => File['/a/backup'];
- }
- }
- 'labtest': {
- $wikidb = 'labtestwiki'
- }
- default: {
- fail ("unknown realm ${::realm}")
+ $wikidb = hiera('wikitech_db_name')
+ if !$labtest {
+ cron {
+ 'db-bak':
+ ensure => present,
+ user => 'root',
+ hour => 1,
+ minute => 0,
+ command => '/usr/local/sbin/db-bak.sh > /dev/null 2>&1',
+ require => File['/a/backup'];
+ 'mw-xml':
+ ensure => present,
+ user => 'root',
+ hour => 1,
+ minute => 30,
+ command => '/usr/local/sbin/mw-xml.sh > /dev/null 2>&1',
+ require => File['/a/backup'];
+ 'mw-files':
+ ensure => present,
+ user => 'root',
+ hour => 2,
+ minute => 0,
+ command => '/usr/local/sbin/mw-files.sh > /dev/null 2>&1',
+ require => File['/a/backup'];
+ 'backup-cleanup':
+ ensure => present,
+ user => 'root',
+ hour => 3,
+ minute => 0,
+ command => 'find /a/backup -type f -mtime +4 -delete',
+ require => File['/a/backup'];
}
}
diff --git a/modules/role/manifests/labs/openstack/nova/manager.pp
b/modules/role/manifests/labs/openstack/nova/manager.pp
index f99d8d5..5d5cb4d 100644
--- a/modules/role/manifests/labs/openstack/nova/manager.pp
+++ b/modules/role/manifests/labs/openstack/nova/manager.pp
@@ -11,27 +11,20 @@
include role::labs::openstack::nova::common
$novaconfig = $role::labs::openstack::nova::common::novaconfig
- case $::realm {
- 'production': {
- $sitename = 'wikitech.wikimedia.org'
- $certificate = $sitename
- sslcert::certificate { $sitename: }
- $cert_type = ''
+ $sitename = hiera('labs_osm_host')
+ if hiera('wikitech_use_letsencrypt', false) {
+ $sitename_split = split($sitename, '\.')
+ $certificate = $sitename_split[0]
+ letsencrypt::cert::integrated { $certificate:
+ subjects => $sitename,
+ puppet_svc => 'apache2',
+ system_svc => 'apache2',
}
- 'labtest': {
- $sitename = 'labtestwikitech.wikimedia.org'
- $certificate = 'labtestwikitech'
- letsencrypt::cert::integrated { $certificate:
- subjects => $sitename,
- puppet_svc => 'apache2',
- system_svc => 'apache2',
- }
- $cert_type = '_letsencrypt'
- }
- default: {
- notify {"unknown realm ${::realm}; https cert will not be
installed.":}
- $cert_type = ''
- }
+ $cert_type = '_letsencrypt'
+ } else {
+ $certificate = $sitename
+ sslcert::certificate { $sitename: }
+ $cert_type = ''
}
monitoring::service { 'https':
--
To view, visit https://gerrit.wikimedia.org/r/324220
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie99005924694190b631d34981c6aad65701bc833
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Chasemp <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
