Gehel has submitted this change and it was merged.
Change subject: Scap3 config for Kartotherian
......................................................................
Scap3 config for Kartotherian
Bug: T129150
Change-Id: I12a08831cfc07280f2021adedb00262b5e81686e
Depends-On: Ie2a956c5d14f068771f4cfbb0e673008870012cb
---
M hieradata/common/role/deployment.yaml
M hieradata/common/scap/server.yaml
M modules/kartotherian/manifests/init.pp
3 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Gehel: Verified; Looks good to me, approved
diff --git a/hieradata/common/role/deployment.yaml
b/hieradata/common/role/deployment.yaml
index 5b3137b..bf59741 100644
--- a/hieradata/common/role/deployment.yaml
+++ b/hieradata/common/role/deployment.yaml
@@ -91,9 +91,6 @@
checkout_submodules: true
sentry/sentry:
upstream: https://gerrit.wikimedia.org/r/operations/software/sentry
- kartotherian/deploy:
- upstream: https://gerrit.wikimedia.org/r/maps/kartotherian/deploy
- checkout_submodules: true
tilerator/deploy:
upstream: https://gerrit.wikimedia.org/r/maps/tilerator/deploy
checkout_submodules: true
diff --git a/hieradata/common/scap/server.yaml
b/hieradata/common/scap/server.yaml
index 3b0b5d3..5530687 100644
--- a/hieradata/common/scap/server.yaml
+++ b/hieradata/common/scap/server.yaml
@@ -54,6 +54,8 @@
# The {} acts as an empty hash to use defaults.
mobileapps/deploy: {}
+ kartotherian/deploy: {}
+
# cxserver is the ContentTranslation server.
cxserver/deploy:
repository: cxserver/deploy
diff --git a/modules/kartotherian/manifests/init.pp
b/modules/kartotherian/manifests/init.pp
index 5b398d9..c5886c6 100644
--- a/modules/kartotherian/manifests/init.pp
+++ b/modules/kartotherian/manifests/init.pp
@@ -16,7 +16,8 @@
$pgsql_kartotherian_pass = hiera('maps::postgresql_kartotherian_pass')
service::node { 'kartotherian':
- port => 6533,
- config => template('kartotherian/config.yaml.erb'),
+ port => 6533,
+ config => template('kartotherian/config.yaml.erb'),
+ deployment => 'scap3',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/291930
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I12a08831cfc07280f2021adedb00262b5e81686e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani <tcipri...@wikimedia.org>
Gerrit-Reviewer: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Yurik <yu...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
