Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: cxserver: scap3 migration
......................................................................
cxserver: scap3 migration
Bug: T120104
Change-Id: I612a2cb9144905993f93206ecb67f8ebaf6e6177
---
M hieradata/common/role/deployment.yaml
M hieradata/common/scap/server.yaml
M modules/admin/data/data.yaml
M modules/cxserver/manifests/init.pp
4 files changed, 7 insertions(+), 5 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/hieradata/common/role/deployment.yaml
b/hieradata/common/role/deployment.yaml
index b9f65d0..fc94bf4 100644
--- a/hieradata/common/role/deployment.yaml
+++ b/hieradata/common/role/deployment.yaml
@@ -81,10 +81,6 @@
iegreview/iegreview:
grain: iegreview
upstream: https://gerrit.wikimedia.org/r/wikimedia/iegreview
- cxserver/deploy:
- service_name: cxserver
- upstream: https://gerrit.wikimedia.org/r/mediawiki/services/cxserver/deploy
- checkout_submodules: true
dropwizard/metrics:
gitfat_enabled: true
upstream:
https://gerrit.wikimedia.org/r/operations/software/dropwizard-metrics
diff --git a/hieradata/common/scap/server.yaml
b/hieradata/common/scap/server.yaml
index 1d94da6..4568ed2 100644
--- a/hieradata/common/scap/server.yaml
+++ b/hieradata/common/scap/server.yaml
@@ -57,3 +57,8 @@
# The {} acts as an empty hash to use defaults.
mobileapps/deploy: {}
+
+ # cxserver is the ContentTranslation server.
+ cxserver/deploy:
+ repository: cxserver/deploy
+
diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index eb90b0a..1d3bab1 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -411,7 +411,7 @@
deploy-service:
gid: 763
description: Service deploy users
- members: [eevans, gwicke, mobrovac, demon, twentyafterfour, thcipriani,
dduvall, yurik, bsitzmann, mholloway-shell]
+ members: [eevans, gwicke, mobrovac, demon, twentyafterfour, thcipriani,
dduvall, yurik, bsitzmann, mholloway-shell, kartik]
privileges: []
aqs-admins:
diff --git a/modules/cxserver/manifests/init.pp
b/modules/cxserver/manifests/init.pp
index 74e235d..a53d76a 100644
--- a/modules/cxserver/manifests/init.pp
+++ b/modules/cxserver/manifests/init.pp
@@ -37,5 +37,6 @@
config => template('cxserver/config.yaml.erb'),
healthcheck_url => '',
has_spec => true,
+ deployment => 'scap3',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/286395
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I612a2cb9144905993f93206ecb67f8ebaf6e6177
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: KartikMistry <[email protected]>
Gerrit-Reviewer: 20after4 <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: KartikMistry <[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
