Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: role::deployment::server: fix scap3/trebuchet declarations
......................................................................
role::deployment::server: fix scap3/trebuchet declarations
Some services have been ported to use scap3 but never made the move in
hiera, or had a wrong setup. Fix this issue at least as far as
hiera/puppet are concerned. Also, use the most sensible default for the
repository name in scap::source.
Bug: T143692
Change-Id: I40da5ae838507f02907f143722fe204236ec103d
---
M hieradata/common/role/deployment.yaml
M hieradata/role/common/deployment/server.yaml
M modules/scap/manifests/source.pp
3 files changed, 34 insertions(+), 61 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/common/role/deployment.yaml
b/hieradata/common/role/deployment.yaml
index d82023b..0e037aa 100644
--- a/hieradata/common/role/deployment.yaml
+++ b/hieradata/common/role/deployment.yaml
@@ -16,30 +16,10 @@
eventlogging/eventlogging:
upstream: https://gerrit.wikimedia.org/r/eventlogging
checkout_submodules: true
- # eventlogging/eventbus is the eventlogging codebase, but as a
- # separate deploy target so that eventlogging-service-eventbus
- # deployments can be scheduled separately from other eventlogging
- # codebase deployments.
- eventlogging/eventbus:
- upstream: https://gerrit.wikimedia.org/r/eventlogging
- checkout_submodules: true
ocg/ocg:
upstream: https://gerrit.wikimedia.org/r/mediawiki/services/ocg-collection
service_name: ocg
checkout_submodules: true
- mathoid/deploy:
- upstream: https://gerrit.wikimedia.org/r/mediawiki/services/mathoid/deploy
- service_name: mathoid
- checkout_submodules: true
- citoid/deploy:
- upstream: https://gerrit.wikimedia.org/r/mediawiki/services/citoid/deploy
- service_name: citoid
- checkout_submodules: true
- zotero/translation-server:
- upstream:
https://gerrit.wikimedia.org/r/mediawiki/services/zotero/translation-server
- service_name: zotero
- zotero/translators:
- upstream:
https://gerrit.wikimedia.org/r/mediawiki/services/zotero/translators
rcstream/rcstream:
upstream: https://gerrit.wikimedia.org/r/mediawiki/services/rcstream
service_name: rcstream
@@ -61,8 +41,6 @@
upstream: https://gerrit.wikimedia.org/r/wikimedia/wikimania-scholarships
librenms/librenms:
upstream: https://gerrit.wikimedia.org/r/operations/software/librenms
- servermon/servermon:
- service_name: gunicorn
iegreview/iegreview:
grain: iegreview
upstream: https://gerrit.wikimedia.org/r/wikimedia/iegreview
@@ -85,8 +63,3 @@
upstream: https://gerrit.wikimedia.org/r/analytics/aqs/deploy
service_name: aqs
checkout_submodules: true
- changeprop/deploy:
- upstream:
https://gerrit.wikimedia.org/r/mediawiki/services/change-propagation/deploy
- checkout_submodules: true
- dumps/dumps:
- upstream: https://gerrit.wikimedia.org/r/operations/dumps
diff --git a/hieradata/role/common/deployment/server.yaml
b/hieradata/role/common/deployment/server.yaml
index d1f244d..d22dc2d 100644
--- a/hieradata/role/common/deployment/server.yaml
+++ b/hieradata/role/common/deployment/server.yaml
@@ -64,52 +64,52 @@
# by the scap::server class. Each source listed here
# will be cloned on the scap deploy server.
scap::sources:
-
- # Analytics data refinement tools
- # https://wikitech.wikimedia.org/wiki/Analytics/Cluster/Refinery
analytics/refinery:
repository: analytics/refinery
scap_repository: analytics/refinery/scap
-
- phabricator/deployment:
- repository: phabricator/deployment
-
- # Source code for taking XML dumps and snapshots of Mediawiki.
+ changeprop/deploy: {}
+# lvs_service: changeprop
+ citoid/deploy: {}
+# lvs_service: citoid
+ cxserver/deploy: {}
+# lvs_service: cxserver
dumps/dumps:
repository: operations/dumps
scap_repository: operations/dumps/scap
-
- # eventbus runs eventlogging-service.
- # See: https://wikitech.wikimedia.org/wiki/EventBus
eventlogging/eventbus:
repository: eventlogging
scap_repository: eventlogging/scap/eventbus
-
- # eventlogging/analytics is the original EventLogging server deployment.
eventlogging/analytics:
repository: eventlogging
scap_repository: eventlogging/scap/analytics
-
- # The {} acts as an empty hash to use defaults.
- mobileapps/deploy: {}
-
- kartotherian/deploy: {}
- tilerator/deploy: {}
graphoid/deploy: {}
-
+# lvs_service: graphoid
+ kartotherian/deploy:
+ repository: maps/kartotherian/deploy
+# lvs_service: kartotherian
+ mathoid/deploy: {}
+# lvs_service: mathoid
+ mobileapps/deploy: {}
+# lvs_service: mobileapps
+ ores/deploy: {}
+# lvs_service: ores
parsoid/deploy: {}
-
- # cxserver is the ContentTranslation server.
- cxserver/deploy:
- repository: cxserver/deploy
-
- # ores is the Objective Revision Evaluation Service
- ores/deploy:
- repository: mediawiki/services/ores/deploy
-
- wdqs/wdqs:
- repository: wikidata/query/deploy
-
- # Striker is the Tool Labs admin console application
+# lvs_service: parsoid
+ phabricator/deployment:
+ repository: phabricator/deployment
+ # This is actually cloned from github at the moment and the repository
indicated
+ # doesn't exist.
+ servermon/servermon:
+ repository: operations/software/servermon
striker/deploy:
repository: labs/striker/deploy
+ tilerator/deploy:
+ repository: maps/tilerator/deploy
+# lvs_service: tilerator
+ wdqs/wdqs:
+ repository: wikidata/query/deploy
+# lvs_service: wdqs
+ zotero/translation-server: {}
+# lvs_service: zotero
+ zotero/translators: {}
+# lvs_service: zotero
diff --git a/modules/scap/manifests/source.pp b/modules/scap/manifests/source.pp
index 5a8fc05..e36ef90 100644
--- a/modules/scap/manifests/source.pp
+++ b/modules/scap/manifests/source.pp
@@ -71,7 +71,7 @@
# }
#
define scap::source(
- $repository = $title,
+ $repository = "mediawiki/services/${title}",
$scap_repository = false,
# TODO: change scap repo owner when scap figures out
# how to bootstrap itself properly without trebuchet.
--
To view, visit https://gerrit.wikimedia.org/r/306440
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I40da5ae838507f02907f143722fe204236ec103d
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
