Rush has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/392711 )
Change subject: openstack: consolidate labtest regex matches
......................................................................
openstack: consolidate labtest regex matches
Bug: T171494
Change-Id: Ia3c74facd1e1bb0cd7bcf9163e34c2135b984c9d
---
M hieradata/codfw/profile/openstack/labtest/nova.yaml
M hieradata/regex.yaml
M modules/role/manifests/openldap/labtest.pp
3 files changed, 24 insertions(+), 35 deletions(-)
Approvals:
Rush: Verified; Looks good to me, approved
diff --git a/hieradata/codfw/profile/openstack/labtest/nova.yaml
b/hieradata/codfw/profile/openstack/labtest/nova.yaml
index 5b64057..6d124f3 100644
--- a/hieradata/codfw/profile/openstack/labtest/nova.yaml
+++ b/hieradata/codfw/profile/openstack/labtest/nova.yaml
@@ -1,3 +1,7 @@
+# This address range is not really used for labtest external, it is
+# used for labs in eqiad. We are using it as a placeholder for now
+# with no actual advertisement or needed external services for now
+# 208.80.155.0/22
profile::openstack::labtest::nova::dmz_cidr: '208.80.155.0/22,10.0.0.0/8'
profile::openstack::labtest::nova::dhcp_domain: 'codfw.labtest'
profile::openstack::labtest::nova::dhcp_start: '10.196.16.4'
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index a338793..bf33f60 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -116,20 +116,6 @@
__regex: !ruby/regexp
/^lab((net|nodepool|mon)100[1-9]\.eqiad\.wmnet|(services|control)100[1-9]\.wikimedia\.org)$/
cluster: labs
-labtestvirt:
- __regex: !ruby/regexp /^labtestvirt20[0-9][0-9]\.codfw\.wmnet$/
- cluster: labtestvirt
-
-labtest:
- __regex: !ruby/regexp
/^labtest(net200[1-9]\.codfw\.wmnet|(services|control)100[1-9]\.wikimedia\.org)$/
- cluster: labtest
- mariadb::monitor_process::is_critical: false
- mariadb::monitor_disk::is_critical: false
- openstack::designate::monitor::critical: false
- openstack::nova::conductor::monitor::critical: false
- openstack::nova::network::monitor::critical: false
- icinga::monitor::toollabs::critical: false
-
swift_be_codfw_dell:
__regex: !ruby/regexp /^ms-be201[3-5]\.codfw\.wmnet$/
swift_storage_drives: [
@@ -196,26 +182,23 @@
__regex: !ruby/regexp /^maps-test200[1-4]\.codfw\.wmnet$/
cassandra::target_version: '2.2'
-# These values are site/realm specific for LABTEST infrastructure
-
-# This address range is not really used for labtest external, it is
-# used for labs in eqiad. We are using it as a placeholder for now
-# with no actual advertisement or needed external services for now
-# 208.80.155.0/22
-
-# no Icinga SMS for test machines
labtest:
__regex: !ruby/regexp /^labtest/
+ cluster: labtest
+ # no Icinga SMS for test machines
do_paging: false
+ # class ldap::role::config::labs {
+ # $hieraldapconfig = hiera_hash('labsldapconfig', {})
labsldapconfig:
hostname: labtestservices2001.wikimedia.org
secondary_hostname: labtestservices2001.wikimedia.org
- labsdnsconfig:
- host: 'labtest-ns0.wikimedia.org'
- host_secondary: 'labtest-ns0.wikimedia.org'
- dbserver: 'localhost'
- recursor: 'labtest-recursor0.wikimedia.org'
- recursor_secondary: 'labtest-recursor0.wikimedia.org'
+ mariadb::monitor_process::is_critical: false
+ mariadb::monitor_disk::is_critical: false
+ openstack::designate::monitor::critical: false
+ openstack::nova::conductor::monitor::critical: false
+ openstack::nova::network::monitor::critical: false
+ icinga::monitor::toollabs::critical: false
+
# require WriteBack policy to all hosts (independent of the role) that look
# like databases. Currently this only works for megacli systems, but it will
diff --git a/modules/role/manifests/openldap/labtest.pp
b/modules/role/manifests/openldap/labtest.pp
index 172f44e..2cdbc1b 100644
--- a/modules/role/manifests/openldap/labtest.pp
+++ b/modules/role/manifests/openldap/labtest.pp
@@ -1,17 +1,19 @@
-# LDAP servers for labs test cluster
+# LDAP servers for labtest cluster
# this is a fork of role::openldap::labs, minus the mirroring and monitoring
-class role::openldap::labtest {
- include passwords::openldap::labtest
- include ::base::firewall
-
- $ldapconfig = hiera_hash('labsldapconfig', {})
- $ldap_labs_hostname = $ldapconfig['hostname']
+class role::openldap::labtest(
+ $ldap_labs_hosts = hiera('profile::openstack::labtest::ldap_hosts'),
+ ) {
system::role { 'openldap::labtest':
description => 'LDAP servers for labs test cluster (based on OpenLDAP)'
}
+ include passwords::openldap::labtest
+ include ::base::firewall
+
+ $ldap_labs_hostname = $ldap_labs_hosts[0]
+
# Certificate needs to be readable by slapd
sslcert::certificate { $ldap_labs_hostname:
group => 'openldap',
--
To view, visit https://gerrit.wikimedia.org/r/392711
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3c74facd1e1bb0cd7bcf9163e34c2135b984c9d
Gerrit-PatchSet: 11
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
