Dzahn has submitted this change and it was merged.
Change subject: include 'bastionhost' on bastion hosts
......................................................................
include 'bastionhost' on bastion hosts
the existing situation is not consistent
- include "bastionhost" on bast4001 and iron
they are bastion hosts so they should likely
include the bastion host class
- bast1001 and fenari already include "bastionhost"
this sets role "bastionhost" in the module init.pp
- do not set system::role it in site.pp directly
Change-Id: I922e4ee5ede0dd2af6dd88c89eaa76bf23b89dbc
---
M manifests/site.pp
1 file changed, 2 insertions(+), 7 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index dd94ee7..645f202 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -286,9 +286,6 @@
}
node 'bast1001.wikimedia.org' {
- system::role { 'misc':
- description => 'Bastion Server',
- }
$cluster = 'misc'
$domain_search = 'wikimedia.org eqiad.wmnet pmtpa.wmnet
esams.wikimedia.org'
@@ -313,7 +310,6 @@
}
node 'bast4001.wikimedia.org' {
- system::role { 'misc': description => 'Operations Bastion' }
$cluster = 'misc'
$domain_search = 'wikimedia.org eqiad.wmnet pmtpa.wmnet ulsfo.wmnet
esams.wikimedia.org'
@@ -323,6 +319,7 @@
include admin
include standard
+ include bastionhost
include misc::management::ipmi
include role::installserver::tftp-server
@@ -1096,9 +1093,6 @@
}
node 'fenari.wikimedia.org' {
- system::role { 'misc':
- description => 'Bastion & NOC Server',
- }
$cluster = 'misc'
$domain_search = 'wikimedia.org pmtpa.wmnet eqiad.wmnet
esams.wikimedia.org'
@@ -1284,6 +1278,7 @@
include admin
include standard
+ include bastionhost
include misc::management::ipmi
include role::access_new_install
--
To view, visit https://gerrit.wikimedia.org/r/122399
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I922e4ee5ede0dd2af6dd88c89eaa76bf23b89dbc
Gerrit-PatchSet: 9
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: Chasemp <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Matanya <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: RobH <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
