Filippo Giunchedi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/366466 )

Change subject: Add the Scap3 configuration
......................................................................


Add the Scap3 configuration

Bug: T116340
Change-Id: I0726e183e494471dee6abc6d1eeb110113bad3f1
---
A scap/environments/aqs/aqs
A scap/environments/aqs/aqs-canary
A scap/environments/aqs/scap.cfg
A scap/environments/beta/betacluster
A scap/environments/beta/scap.cfg
A scap/environments/dev-cluster/dev-cluster
A scap/environments/dev-cluster/dev-cluster-canary
A scap/environments/dev-cluster/scap.cfg
A scap/environments/staging/scap.cfg
A scap/environments/staging/staging
A scap/environments/staging/staging-canary
A scap/scap.cfg
A scap/target-canary
A scap/targets
14 files changed, 81 insertions(+), 0 deletions(-)

Approvals:
  Thcipriani: Looks good to me, but someone else must approve
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/scap/environments/aqs/aqs b/scap/environments/aqs/aqs
new file mode 100644
index 0000000..a65ca1d
--- /dev/null
+++ b/scap/environments/aqs/aqs
@@ -0,0 +1,5 @@
+aqs1005.eqiad.wmnet
+aqs1006.eqiad.wmnet
+aqs1007.eqiad.wmnet
+aqs1008.eqiad.wmnet
+aqs1009.eqiad.wmnet
diff --git a/scap/environments/aqs/aqs-canary b/scap/environments/aqs/aqs-canary
new file mode 100644
index 0000000..402154a
--- /dev/null
+++ b/scap/environments/aqs/aqs-canary
@@ -0,0 +1 @@
+aqs1004.eqiad.wmnet
diff --git a/scap/environments/aqs/scap.cfg b/scap/environments/aqs/scap.cfg
new file mode 100644
index 0000000..1c9cf4d
--- /dev/null
+++ b/scap/environments/aqs/scap.cfg
@@ -0,0 +1,4 @@
+[wmnet]
+server_groups: canary, default
+dsh_targets: aqs
+canary_dsh_targets: aqs-canary
diff --git a/scap/environments/beta/betacluster 
b/scap/environments/beta/betacluster
new file mode 100644
index 0000000..b75c80b
--- /dev/null
+++ b/scap/environments/beta/betacluster
@@ -0,0 +1,5 @@
+deployment-restbase01.deployment-prep.eqiad.wmflabs
+deployment-restbase02.deployment-prep.eqiad.wmflabs
+deployment-aqs01.deployment-prep.eqiad.wmflabs
+deployment-aqs02.deployment-prep.eqiad.wmflabs
+deployment-aqs03.deployment-prep.eqiad.wmflabs
diff --git a/scap/environments/beta/scap.cfg b/scap/environments/beta/scap.cfg
new file mode 100644
index 0000000..323d650
--- /dev/null
+++ b/scap/environments/beta/scap.cfg
@@ -0,0 +1,3 @@
+[deployment-prep.eqiad.wmflabs]
+server_groups: default
+dsh_targets: betacluster
diff --git a/scap/environments/dev-cluster/dev-cluster 
b/scap/environments/dev-cluster/dev-cluster
new file mode 100644
index 0000000..da8cd74
--- /dev/null
+++ b/scap/environments/dev-cluster/dev-cluster
@@ -0,0 +1,2 @@
+restbase-dev1005.eqiad.wmnet
+restbase-dev1006.eqiad.wmnet
diff --git a/scap/environments/dev-cluster/dev-cluster-canary 
b/scap/environments/dev-cluster/dev-cluster-canary
new file mode 100644
index 0000000..c182aa5
--- /dev/null
+++ b/scap/environments/dev-cluster/dev-cluster-canary
@@ -0,0 +1 @@
+restbase-dev1004.eqiad.wmnet
diff --git a/scap/environments/dev-cluster/scap.cfg 
b/scap/environments/dev-cluster/scap.cfg
new file mode 100644
index 0000000..0b84de0
--- /dev/null
+++ b/scap/environments/dev-cluster/scap.cfg
@@ -0,0 +1,4 @@
+[wmnet]
+server_groups: canary, default
+dsh_targets: dev-cluster
+canary_dsh_targets: dev-cluster-canary
diff --git a/scap/environments/staging/scap.cfg 
b/scap/environments/staging/scap.cfg
new file mode 100644
index 0000000..8e33939
--- /dev/null
+++ b/scap/environments/staging/scap.cfg
@@ -0,0 +1,4 @@
+[wmnet]
+server_groups: canary, default
+dsh_targets: staging
+canary_dsh_targets: staging-canary
diff --git a/scap/environments/staging/staging 
b/scap/environments/staging/staging
new file mode 100644
index 0000000..6ae57fa
--- /dev/null
+++ b/scap/environments/staging/staging
@@ -0,0 +1,5 @@
+cerium.eqiad.wmnet
+xenon.eqiad.wmnet
+restbase-test2001.codfw.wmnet
+restbase-test2002.codfw.wmnet
+restbase-test2003.codfw.wmnet
diff --git a/scap/environments/staging/staging-canary 
b/scap/environments/staging/staging-canary
new file mode 100644
index 0000000..d1f8136
--- /dev/null
+++ b/scap/environments/staging/staging-canary
@@ -0,0 +1 @@
+praseodymium.eqiad.wmnet
diff --git a/scap/scap.cfg b/scap/scap.cfg
new file mode 100644
index 0000000..274c461
--- /dev/null
+++ b/scap/scap.cfg
@@ -0,0 +1,22 @@
+[global]
+# the repo's name in gerrit and ops/puppet
+git_repo: cassandra/logstash-logback-encoder
+# the user that can clone the repo
+git_repo_user: deploy-service
+# the user to act as on the target server
+ssh_user: deploy-service
+# the server deployment groups
+server_groups: canary, default
+# the file name containing the target host list
+dsh_targets: targets
+# the size of each group to deploy in parallel
+group_size: 10
+# this repository uses gitfat
+git_fat: True
+# the file name containing the list of canaries
+canary_dsh_targets: target-canary
+# we do not permit the canaries to fail
+canary_failure_limit: 0
+
+[deployment-prep.eqiad.wmflabs]
+environment: beta
diff --git a/scap/target-canary b/scap/target-canary
new file mode 100644
index 0000000..2259262
--- /dev/null
+++ b/scap/target-canary
@@ -0,0 +1,2 @@
+restbase2001.codfw.wmnet
+restbase1007.eqiad.wmnet
diff --git a/scap/targets b/scap/targets
new file mode 100644
index 0000000..7a8ee83
--- /dev/null
+++ b/scap/targets
@@ -0,0 +1,22 @@
+restbase1008.eqiad.wmnet
+restbase1009.eqiad.wmnet
+restbase1010.eqiad.wmnet
+restbase1011.eqiad.wmnet
+restbase1012.eqiad.wmnet
+restbase1013.eqiad.wmnet
+restbase1014.eqiad.wmnet
+restbase1015.eqiad.wmnet
+restbase1016.eqiad.wmnet
+restbase1017.eqiad.wmnet
+restbase1018.eqiad.wmnet
+restbase2002.codfw.wmnet
+restbase2003.codfw.wmnet
+restbase2004.codfw.wmnet
+restbase2005.codfw.wmnet
+restbase2006.codfw.wmnet
+restbase2007.codfw.wmnet
+restbase2008.codfw.wmnet
+restbase2009.codfw.wmnet
+restbase2010.codfw.wmnet
+restbase2011.codfw.wmnet
+restbase2012.codfw.wmnet

-- 
To view, visit https://gerrit.wikimedia.org/r/366466
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0726e183e494471dee6abc6d1eeb110113bad3f1
Gerrit-PatchSet: 6
Gerrit-Project: operations/software/logstash-logback-encoder
Gerrit-Branch: master
Gerrit-Owner: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Eevans <eev...@wikimedia.org>
Gerrit-Reviewer: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Thcipriani <tcipri...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to