Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/401548 )
Change subject: bastionhost: add role for caching PoPs
......................................................................
bastionhost: add role for caching PoPs
This is a role for bastionhosts in our caching PoPs, where they also
host the installserver tftp, the prometheus collector and the ipmi
management tools.
This patch adds role::ipmi::mgmt to the esams bastion for uniformity.
Change-Id: I8504878d64cb7612abcdf01b6f92539f3693ae3f
---
A hieradata/role/common/bastionhost/pop.yaml
M manifests/site.pp
A modules/role/manifests/bastionhost/pop.pp
3 files changed, 23 insertions(+), 11 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/role/common/bastionhost/pop.yaml
b/hieradata/role/common/bastionhost/pop.yaml
new file mode 100644
index 0000000..3f8f20e
--- /dev/null
+++ b/hieradata/role/common/bastionhost/pop.yaml
@@ -0,0 +1,10 @@
+cluster: misc
+profile::base::domain_search:
+ - wikimedia.org
+ - eqiad.wmnet
+ - codfw.wmnet
+ - esams.wmnet
+ - ulsfo.wmnet
+ - eqsin.wmnet
+admin::groups:
+ - all-users
diff --git a/manifests/site.pp b/manifests/site.pp
index 1215fdb..7cd34b6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -94,28 +94,20 @@
# Bastion in the Netherlands (replaced bast3001)
node 'bast3002.wikimedia.org' {
- role(bastionhost::general,
- installserver::tftp,
- prometheus::ops)
+ role(bastionhost::pop)
interface::add_ip6_mapped { 'main': }
}
# Bastion in California
node 'bast4001.wikimedia.org' {
- role(bastionhost::general,
- ipmi::mgmt,
- installserver::tftp,
- prometheus::ops)
+ role(bastionhost::pop)
interface::add_ip6_mapped { 'main': }
}
node 'bast4002.wikimedia.org' {
- role(bastionhost::general,
- ipmi::mgmt,
- installserver::tftp,
- prometheus::ops)
+ role(bastionhost::pop)
interface::add_ip6_mapped { 'main': }
}
diff --git a/modules/role/manifests/bastionhost/pop.pp
b/modules/role/manifests/bastionhost/pop.pp
new file mode 100644
index 0000000..ade59e5
--- /dev/null
+++ b/modules/role/manifests/bastionhost/pop.pp
@@ -0,0 +1,10 @@
+# bastion host for all users in a caching PoP
+class role::bastionhost::pop {
+ system::role { 'bastionhost::pop':
+ description => 'Bastion host for all shell users in a caching Pop',
+ }
+ require ::role::bastionhost::general
+ require ::role::installserver::tftp
+ require ::role::prometheus::ops
+ require ::role::ipmi::mgmt
+}
--
To view, visit https://gerrit.wikimedia.org/r/401548
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8504878d64cb7612abcdf01b6f92539f3693ae3f
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[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
