BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/399817 )
Change subject: eqsin: a few more basic puppetization fixups
......................................................................
eqsin: a few more basic puppetization fixups
Bug: T156027
Change-Id: I549296ce1056a8f1bdcd88abf6dc7ba4a2f98257
---
A hieradata/eqsin.yaml
A hieradata/eqsin/profile/base.yaml
A hieradata/role/eqsin/cache/text.yaml
A hieradata/role/eqsin/cache/upload.yaml
A hieradata/role/eqsin/lvs/balancer.yaml
M modules/install_server/files/autoinstall/scripts/late_command.sh
6 files changed, 12 insertions(+), 1 deletion(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/eqsin.yaml b/hieradata/eqsin.yaml
new file mode 100644
index 0000000..1341789
--- /dev/null
+++ b/hieradata/eqsin.yaml
@@ -0,0 +1,5 @@
+prometheus_nodes:
+ - bast5001.wikimedia.org
+
+# Which of our redundant unified cert vendors to use in each DC
+public_tls_unified_cert_vendor: "digicert-2017"
diff --git a/hieradata/eqsin/profile/base.yaml
b/hieradata/eqsin/profile/base.yaml
new file mode 100644
index 0000000..ccff624
--- /dev/null
+++ b/hieradata/eqsin/profile/base.yaml
@@ -0,0 +1,2 @@
+profile::base::remote_syslog_tls: ['syslog.eqiad.wmnet:6514',
'syslog.codfw.wmnet:6514']
+profile::base::remote_syslog: []
diff --git a/hieradata/role/eqsin/cache/text.yaml
b/hieradata/role/eqsin/cache/text.yaml
new file mode 100644
index 0000000..a3d63bf
--- /dev/null
+++ b/hieradata/role/eqsin/cache/text.yaml
@@ -0,0 +1 @@
+profile::cache::base::purge_varnishes: ['127.0.0.1:3128,1.5',
'127.0.0.1:3127,1.0']
diff --git a/hieradata/role/eqsin/cache/upload.yaml
b/hieradata/role/eqsin/cache/upload.yaml
new file mode 100644
index 0000000..a3d63bf
--- /dev/null
+++ b/hieradata/role/eqsin/cache/upload.yaml
@@ -0,0 +1 @@
+profile::cache::base::purge_varnishes: ['127.0.0.1:3128,1.5',
'127.0.0.1:3127,1.0']
diff --git a/hieradata/role/eqsin/lvs/balancer.yaml
b/hieradata/role/eqsin/lvs/balancer.yaml
new file mode 100644
index 0000000..ada9df4
--- /dev/null
+++ b/hieradata/role/eqsin/lvs/balancer.yaml
@@ -0,0 +1,2 @@
+profile::pybal::config_host: conf2003.codfw.wmnet
+profile::lvs::tagged_subnets: []
diff --git a/modules/install_server/files/autoinstall/scripts/late_command.sh
b/modules/install_server/files/autoinstall/scripts/late_command.sh
index 9359467..d22917e 100644
--- a/modules/install_server/files/autoinstall/scripts/late_command.sh
+++ b/modules/install_server/files/autoinstall/scripts/late_command.sh
@@ -21,7 +21,7 @@
# optimized mkfs for all cache nodes
case `hostname` in \
- cp[1234]*)
+ cp[1-9]*)
mke2fs -F -F -t ext4 -T huge -m 0 -L sda3-varnish /dev/sda3
mke2fs -F -F -t ext4 -T huge -m 0 -L sdb3-varnish /dev/sdb3
;; \
--
To view, visit https://gerrit.wikimedia.org/r/399817
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I549296ce1056a8f1bdcd88abf6dc7ba4a2f98257
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
