Alexandros Kosiaris has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403417 )
Change subject: Fix role::tcpircbot lookups for tegmen/einsteinium
......................................................................
Fix role::tcpircbot lookups for tegmen/einsteinium
Both ended up running tcpircbot
Change-Id: I59f2ea741f5030d153c927d2ee9a5a72e98f2c4d
---
M hieradata/hosts/einsteinium.yaml
M hieradata/hosts/tegmen.yaml
M modules/profile/manifests/tcpircbot.pp
M modules/role/manifests/tcpircbot.pp
4 files changed, 4 insertions(+), 7 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/hosts/einsteinium.yaml b/hieradata/hosts/einsteinium.yaml
index c77d046..913bdd5 100644
--- a/hieradata/hosts/einsteinium.yaml
+++ b/hieradata/hosts/einsteinium.yaml
@@ -7,6 +7,6 @@
- eqsin.wmnet
role::icinga::partner: tegmen.wikimedia.org
# Note that our paging infrastructure (AQL as of 20161101) may need an update
of it's sender whitelist
-role::tcpircbot::ensure: absent
+profile::tcpircbot::ensure: absent
do_acme: false
role::icinga::passive: true
diff --git a/hieradata/hosts/tegmen.yaml b/hieradata/hosts/tegmen.yaml
index 4590e85..b34137e 100644
--- a/hieradata/hosts/tegmen.yaml
+++ b/hieradata/hosts/tegmen.yaml
@@ -8,6 +8,6 @@
role::icinga::partner: einsteinium.wikimedia.org
# Note that our paging infrastructure (AQL as of 20161101) may need an update
of it's sender whitelist
# tegmen is the backup icinga server. All these flags need to be converted
accordingly for it to assume the identity of the primary
-role::tcpircbot::ensure: present
+profile::tcpircbot::ensure: present
do_acme: true
role::icinga::passive: false
diff --git a/modules/profile/manifests/tcpircbot.pp
b/modules/profile/manifests/tcpircbot.pp
index 6e33d0d..02e645a 100644
--- a/modules/profile/manifests/tcpircbot.pp
+++ b/modules/profile/manifests/tcpircbot.pp
@@ -3,6 +3,7 @@
){
include passwords::logmsgbot
+ include ::tcpircbot
tcpircbot::instance { 'logmsgbot':
ensure => $ensure,
diff --git a/modules/role/manifests/tcpircbot.pp
b/modules/role/manifests/tcpircbot.pp
index 8a4799f..7b2cd91 100644
--- a/modules/role/manifests/tcpircbot.pp
+++ b/modules/role/manifests/tcpircbot.pp
@@ -4,9 +4,5 @@
description => 'tcpircbot server',
}
- include ::tcpircbot
-
- class { '::profile::tcpircbot':
- ensure => 'present',
- }
+ include ::profile::tcpircbot
}
--
To view, visit https://gerrit.wikimedia.org/r/403417
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I59f2ea741f5030d153c927d2ee9a5a72e98f2c4d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
