Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346633 )
Change subject: Scap3: Copy the global config over to environments ...................................................................... Scap3: Copy the global config over to environments Scap3 does not automatically merge the global scap.cfg with the environment-provided one, so copy over the definitions until the problem is fixed on the Scap3 side. Change-Id: I59081702f5ee10d6bcd7ef2e787dc1293ece7c1b --- M scap/environments/beta/scap.cfg M scap/environments/dev-cluster/dev-cluster A scap/environments/dev-cluster/dev-cluster-canary M scap/environments/dev-cluster/scap.cfg M scap/environments/staging/scap.cfg M scap/environments/staging/staging A scap/environments/staging/staging-canary 7 files changed, 40 insertions(+), 5 deletions(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/scap/environments/beta/scap.cfg b/scap/environments/beta/scap.cfg index c43df29..b8c4813 100644 --- a/scap/environments/beta/scap.cfg +++ b/scap/environments/beta/scap.cfg @@ -1,4 +1,16 @@ [deployment-prep.eqiad.wmflabs] +# XXX: Copied contents from scap/scap.cfg +git_repo: restbase/deploy +git_deploy_dir: /srv/deployment +git_repo_user: deploy-service +ssh_user: deploy-service +git_submodules: True +service_name: restbase +service_port: 7231 +service_timeout: 240 +lock_file: /tmp/scap.restbase.lock +# XXX: End of copied contents git_server: deployment-tin.deployment-prep.eqiad.wmflabs server_groups: default dsh_targets: betacluster +group_size: 1 diff --git a/scap/environments/dev-cluster/dev-cluster b/scap/environments/dev-cluster/dev-cluster index 0caee69..eda5232 100644 --- a/scap/environments/dev-cluster/dev-cluster +++ b/scap/environments/dev-cluster/dev-cluster @@ -1,3 +1,2 @@ -restbase-dev1001.eqiad.wmnet restbase-dev1002.eqiad.wmnet restbase-dev1003.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..8e808a6 --- /dev/null +++ b/scap/environments/dev-cluster/dev-cluster-canary @@ -0,0 +1 @@ +restbase-dev1001.eqiad.wmnet diff --git a/scap/environments/dev-cluster/scap.cfg b/scap/environments/dev-cluster/scap.cfg index 97aa58e..886bea4 100644 --- a/scap/environments/dev-cluster/scap.cfg +++ b/scap/environments/dev-cluster/scap.cfg @@ -1,4 +1,15 @@ [wmnet] -server_groups: default +# XXX: Copied contents from scap/scap.cfg +git_repo: restbase/deploy +git_deploy_dir: /srv/deployment +git_repo_user: deploy-service +ssh_user: deploy-service +git_submodules: True +service_name: restbase +service_port: 7231 +service_timeout: 240 +lock_file: /tmp/scap.restbase.lock +# XXX: End of copied contents +server_groups: canary, default dsh_targets: dev-cluster -group_size: 2 +canary_dsh_targets: dev-cluster-canary diff --git a/scap/environments/staging/scap.cfg b/scap/environments/staging/scap.cfg index 786be3e..f9a998e 100644 --- a/scap/environments/staging/scap.cfg +++ b/scap/environments/staging/scap.cfg @@ -1,4 +1,16 @@ [wmnet] -server_groups: default +# XXX: Copied contents from scap/scap.cfg +git_repo: restbase/deploy +git_deploy_dir: /srv/deployment +git_repo_user: deploy-service +ssh_user: deploy-service +git_submodules: True +service_name: restbase +service_port: 7231 +service_timeout: 240 +lock_file: /tmp/scap.restbase.lock +# XXX: End of copied contents +server_groups: canary, default dsh_targets: staging +canary_dsh_targets: staging-canary group_size: 2 diff --git a/scap/environments/staging/staging b/scap/environments/staging/staging index c262b89..6ae57fa 100644 --- a/scap/environments/staging/staging +++ b/scap/environments/staging/staging @@ -1,5 +1,4 @@ cerium.eqiad.wmnet -praseodymium.eqiad.wmnet xenon.eqiad.wmnet restbase-test2001.codfw.wmnet restbase-test2002.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 -- To view, visit https://gerrit.wikimedia.org/r/346633 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I59081702f5ee10d6bcd7ef2e787dc1293ece7c1b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac <[email protected]> Gerrit-Reviewer: Mobrovac <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
