Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348194 )
Change subject: ci/labs/tendril: add some comments/FIXMEs about moving Hiera
lookups
......................................................................
ci/labs/tendril: add some comments/FIXMEs about moving Hiera lookups
Change-Id: Ic8a53d6f37d4a375942a3245532a53834788b874
---
M modules/jenkins/manifests/init.pp
M modules/role/manifests/ci/master.pp
M modules/role/manifests/labs/dns.pp
M modules/role/manifests/tendril.pp
4 files changed, 14 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/jenkins/manifests/init.pp
b/modules/jenkins/manifests/init.pp
index e7e5a72..67d0dfd 100644
--- a/modules/jenkins/manifests/init.pp
+++ b/modules/jenkins/manifests/init.pp
@@ -167,6 +167,10 @@
],
}
+ # TODO/FIXME: remove hiera condition once T150771 is resolved
+ # and jenkins service is running active/active in both DCs
+ # aware that there should not be permanent hiera lookups here
+ # should also be converted to profile/role anyways (T162822)
if hiera('jenkins::service_monitor', true) {
nrpe::monitor_service { 'jenkins':
description => 'jenkins_service_running',
diff --git a/modules/role/manifests/ci/master.pp
b/modules/role/manifests/ci/master.pp
index d9cec9e..305db6d 100644
--- a/modules/role/manifests/ci/master.pp
+++ b/modules/role/manifests/ci/master.pp
@@ -51,6 +51,10 @@
hour => '*',
}
+ # TODO/FIXME: remove hiera condition once T150771 is resolved
+ # and jenkins service is running active/active in both DCs
+ # aware that there should not be permanent hiera lookups in role
+ # should also be converted to profile/role anyways (T162822)
if hiera('jenkins::service_monitor', true) {
nrpe::monitor_service { 'jenkins_zmq_publisher':
description => 'jenkins_zmq_publisher',
diff --git a/modules/role/manifests/labs/dns.pp
b/modules/role/manifests/labs/dns.pp
index f8629a4..2343d23 100644
--- a/modules/role/manifests/labs/dns.pp
+++ b/modules/role/manifests/labs/dns.pp
@@ -128,6 +128,8 @@
ip_address => $::ipaddress_eth0,
}
+ # T152024 | TODO/FIXME: move hiera lookup to paramater of a profile class
+ # (along with all other hiera lookups while converting to profile/role)
if hiera('labs::dns::gridmaster::monitor', true) {
monitoring::service { "${auth_soa_name} Auth DNS UDP":
host => $auth_soa_name,
diff --git a/modules/role/manifests/tendril.pp
b/modules/role/manifests/tendril.pp
index 8e170cf..04aba9d 100644
--- a/modules/role/manifests/tendril.pp
+++ b/modules/role/manifests/tendril.pp
@@ -7,6 +7,10 @@
system::role { 'role::tendril': description => 'tendril server' }
+ # T62183 | TODO/FIXME: remove hiera condition once T150771 is resolved
+ # aware that there should not be a permanent hiera lookup here
+ # should be converted to role/profile anyways (like everything else)
+ # if still needed move hiera lookup to parameters
if hiera('do_acme', true) {
monitoring::service { 'https-tendril':
description => 'HTTPS-tendril',
--
To view, visit https://gerrit.wikimedia.org/r/348194
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8a53d6f37d4a375942a3245532a53834788b874
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
