Alexandros Kosiaris has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346248 )
Change subject: RESTBase: Migrate to Scap3 deployment
......................................................................
RESTBase: Migrate to Scap3 deployment
Bug: T116335
Change-Id: Ifac534a05d0f5f8df6effbed8b066e5a44b65224
Depends-On: Ic311e24a74a3fc7ae65c4be2180f816358c1763f
---
M hieradata/common/role/deployment.yaml
M hieradata/labs/deployment-prep/common.yaml
M hieradata/role/common/deployment/server.yaml
M modules/restbase/manifests/init.pp
4 files changed, 6 insertions(+), 4 deletions(-)
Approvals:
Thcipriani: Looks good to me, but someone else must approve
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/hieradata/common/role/deployment.yaml
b/hieradata/common/role/deployment.yaml
index dfe895f..b642364 100644
--- a/hieradata/common/role/deployment.yaml
+++ b/hieradata/common/role/deployment.yaml
@@ -12,10 +12,6 @@
rcstream/rcstream:
upstream: https://gerrit.wikimedia.org/r/mediawiki/services/rcstream
service_name: rcstream
- restbase/deploy:
- upstream: https://gerrit.wikimedia.org/r/mediawiki/services/restbase/deploy
- service_name: restbase
- checkout_submodules: true
fluoride/fluoride:
upstream: https://gerrit.wikimedia.org/r/mediawiki/tools/fluoride
statsv/statsv:
diff --git a/hieradata/labs/deployment-prep/common.yaml
b/hieradata/labs/deployment-prep/common.yaml
index 72fad55..d8b9670 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -276,5 +276,9 @@
# Public EventStreams service
eventstreams/deploy:
repository: mediawiki/services/eventstreams/deploy
+
+ # RESTBase
+ restbase/deploy: {}
+
prometheus_nodes:
- deployment-prometheus01.deployment-prep.eqiad.wmflabs
diff --git a/hieradata/role/common/deployment/server.yaml
b/hieradata/role/common/deployment/server.yaml
index 9a5df2d..36ad813 100644
--- a/hieradata/role/common/deployment/server.yaml
+++ b/hieradata/role/common/deployment/server.yaml
@@ -107,6 +107,7 @@
# lvs_service: parsoid
phabricator/deployment:
repository: phabricator/deployment
+ restbase/deploy: {}
# This is actually cloned from github at the moment and the repository
indicated
# doesn't exist.
servermon/servermon:
diff --git a/modules/restbase/manifests/init.pp
b/modules/restbase/manifests/init.pp
index 20f0c2a..195eee6 100644
--- a/modules/restbase/manifests/init.pp
+++ b/modules/restbase/manifests/init.pp
@@ -145,6 +145,7 @@
has_spec => true,
starter_script => 'restbase/server.js',
auto_refresh => false,
+ deployment => 'scap3',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/346248
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifac534a05d0f5f8df6effbed8b066e5a44b65224
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
Gerrit-Reviewer: Thcipriani <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
