Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346246 )
Change subject: Migrate to Scap3 deploys ...................................................................... Migrate to Scap3 deploys This is the first patch in the set for migrating RESTBase code and config deploys to Scap3. This patch sets up its deploy repo with the needed Scap3 configuration. Bug: T116335 Change-Id: Ic311e24a74a3fc7ae65c4be2180f816358c1763f --- A scap/betacluster A scap/checks.yaml A scap/environments/dev-cluster/dev-cluster A scap/environments/dev-cluster/scap.cfg A scap/environments/staging/scap.cfg A scap/environments/staging/staging A scap/scap.cfg A scap/target-canary A scap/targets 9 files changed, 95 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/46/346246/1 diff --git a/scap/betacluster b/scap/betacluster new file mode 100644 index 0000000..1f41c83 --- /dev/null +++ b/scap/betacluster @@ -0,0 +1,2 @@ +deployment-restbase01.deployment-prep.eqiad.wmflabs +deployment-restbase02.deployment-prep.eqiad.wmflabs diff --git a/scap/checks.yaml b/scap/checks.yaml new file mode 100644 index 0000000..b017077 --- /dev/null +++ b/scap/checks.yaml @@ -0,0 +1,13 @@ +checks: + depool: + type: command + stage: promote + command: depool-restbase + repool: + type: command + stage: restart_service + command: pool-restbase + endpoints: + type: nrpe + stage: restart_service + command: check_endpoints_restbase diff --git a/scap/environments/dev-cluster/dev-cluster b/scap/environments/dev-cluster/dev-cluster new file mode 100644 index 0000000..0caee69 --- /dev/null +++ b/scap/environments/dev-cluster/dev-cluster @@ -0,0 +1,3 @@ +restbase-dev1001.eqiad.wmnet +restbase-dev1002.eqiad.wmnet +restbase-dev1003.eqiad.wmnet diff --git a/scap/environments/dev-cluster/scap.cfg b/scap/environments/dev-cluster/scap.cfg new file mode 100644 index 0000000..97aa58e --- /dev/null +++ b/scap/environments/dev-cluster/scap.cfg @@ -0,0 +1,4 @@ +[wmnet] +server_groups: default +dsh_targets: dev-cluster +group_size: 2 diff --git a/scap/environments/staging/scap.cfg b/scap/environments/staging/scap.cfg new file mode 100644 index 0000000..786be3e --- /dev/null +++ b/scap/environments/staging/scap.cfg @@ -0,0 +1,4 @@ +[wmnet] +server_groups: default +dsh_targets: staging +group_size: 2 diff --git a/scap/environments/staging/staging b/scap/environments/staging/staging new file mode 100644 index 0000000..bfe9e86 --- /dev/null +++ b/scap/environments/staging/staging @@ -0,0 +1,6 @@ +ceriumxenon.eqiad.wmnet +praseodymium.eqiad.wmnet +xenon.eqiad.wmnet +restbase-test2001.codfw.wmnet +restbase-test2002.codfw.wmnet +restbase-test2003.codfw.wmnet diff --git a/scap/scap.cfg b/scap/scap.cfg new file mode 100644 index 0000000..952ef45 --- /dev/null +++ b/scap/scap.cfg @@ -0,0 +1,39 @@ +[global] +# the repo's name in gerrit and ops/puppet +git_repo: restbase/deploy +# the destination path on the target +git_deploy_dir: /srv/deployment +# 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: 5 +# whether there are git submodules to be checked out +git_submodules: True +# the file name containing the list of canaries +canary_dsh_targets: target-canary +# the canary grop size +canary_group_size: 1 +# we do not permit the canaries to fail +canary_failure_limit: 0 +# the name of the service to restart +service_name: restbase +# the port +service_port: 7231 +# we want to wait a bit longer than the default 120 seconds +service_timeout: 240 +# the lock file to use +lock_file: /tmp/scap.restbase.lock + +[wmnet] +git_server: tin.eqiad.wmnet + +[deployment-prep.eqiad.wmflabs] +git_server: deployment-tin.deployment-prep.eqiad.wmflabs +server_groups: default +dsh_targets: betacluster diff --git a/scap/target-canary b/scap/target-canary new file mode 100644 index 0000000..8543001 --- /dev/null +++ b/scap/target-canary @@ -0,0 +1 @@ +restbase2001.codfw.wmnet diff --git a/scap/targets b/scap/targets new file mode 100644 index 0000000..b7cf1ca --- /dev/null +++ b/scap/targets @@ -0,0 +1,23 @@ +restbase1007.eqiad.wmnet +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/346246 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic311e24a74a3fc7ae65c4be2180f816358c1763f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
