Giuseppe Lavagetto has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/377206 )
Change subject: cxserver: convert to role/profile ...................................................................... cxserver: convert to role/profile Change-Id: I04872168708db65d316c7fb32bfc4dd6f536f97b --- M hieradata/labs/deployment-prep/common.yaml M hieradata/role/common/scb.yaml D modules/cxserver/manifests/init.pp D modules/cxserver/tests/Makefile D modules/cxserver/tests/init.pp A modules/profile/manifests/cxserver.pp M modules/role/manifests/cxserver.pp 7 files changed, 31 insertions(+), 63 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index e2f9602..26242c7 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -171,7 +171,7 @@ "role::apertium::apertium_port": 2737 "role::cxserver::cxserver_port": 8080 "misc::syslog-server::basepath": /data/project/syslog -"cxserver::apertium": http://apertium-beta.wmflabs.org +"profile::cxserver::apertium_uri": http://apertium-beta.wmflabs.org role::deployment::mediawiki::key_fingerprint: f0:54:06:fa:17:27:97:a2:cc:69:a0:a7:df:4c:0a:e3 "role::deployment::salt_masters::deployment_server": deployment-tin.deployment-prep.eqiad.wmflabs "hhvm::extra::fcgi": diff --git a/hieradata/role/common/scb.yaml b/hieradata/role/common/scb.yaml index f2e4eec..e6134b5 100644 --- a/hieradata/role/common/scb.yaml +++ b/hieradata/role/common/scb.yaml @@ -95,3 +95,6 @@ # ChangePropagation for JobQueue profile::cpjobqueue::redis_path: "/var/run/nutcracker/redis_%{::site}.sock" profile::cpjobqueue::jobrunner_host: https://jobrunner.discovery.wmnet + +#CXserver +profile::cxserver::apertium_uri: "http://apertium.svc.%{::site}.wmnet:2737"; diff --git a/modules/cxserver/manifests/init.pp b/modules/cxserver/manifests/init.pp deleted file mode 100644 index 206214a..0000000 --- a/modules/cxserver/manifests/init.pp +++ /dev/null @@ -1,36 +0,0 @@ -# == Class: cxserver -# -# cxserver is a node.js backend for the Content Translation tool. -# https://www.mediawiki.org/wiki/Content_translation -# -# === Parameters -# -# [*apertium*] -# Url to Apertium service. -# [*yandex_api_key*] -# API key for Yandex service. -# [*youdao_api_key*] -# API key for Youdao service. -# [*jwt_secret*] -# JWT secret token. -class cxserver( - $apertium = "http://apertium.svc.${::site}.wmnet:2737";, - $yandex_api_key = undef, - $youdao_api_key = undef, - $jwt_secret = undef, -) { - - service::node { 'cxserver': - port => 8080, - healthcheck_url => '', - has_spec => true, - deployment => 'scap3', - deployment_config => true, - deployment_vars => { - jwt_token => $jwt_secret, - apertium_uri => $apertium, - yandex_key => $yandex_api_key, - youdao_key => $youdao_api_key, - }, - } -} diff --git a/modules/cxserver/tests/Makefile b/modules/cxserver/tests/Makefile deleted file mode 100644 index 3551657..0000000 --- a/modules/cxserver/tests/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# Test automator -MANIFESTS=$(wildcard *.pp) -OBJS=$(MANIFESTS:.pp=.po) -TESTS_DIR=$(dir $(CURDIR)) -MODULE_DIR=$(TESTS_DIR:/=) -MODULES_DIR=$(dir $(MODULE_DIR)) - -all: test - -test: $(OBJS) - -%.po: %.pp - puppet parser validate $< - puppet apply --noop --modulepath $(MODULES_DIR) $< diff --git a/modules/cxserver/tests/init.pp b/modules/cxserver/tests/init.pp deleted file mode 100644 index c17a7b0..0000000 --- a/modules/cxserver/tests/init.pp +++ /dev/null @@ -1 +0,0 @@ -include ::cxserver diff --git a/modules/profile/manifests/cxserver.pp b/modules/profile/manifests/cxserver.pp new file mode 100644 index 0000000..a778d0c --- /dev/null +++ b/modules/profile/manifests/cxserver.pp @@ -0,0 +1,26 @@ +# vim: set ts=4 et sw=4: +# +# filtertags: labs-project-deployment-prep + +class profile::cxserver( + $apertium_uri=hiera('profile::cxserver::apertium_uri') +) { + include ::passwords::cxserver + $yandex_api_key = $::passwords::cxserver::yandex_api_key + $youdao_api_key = $::passwords::cxserver::youdao_api_key + $jwt_secret = $::passwords::cxserver::jwt_secret + + service::node { 'cxserver': + port => 8080, + healthcheck_url => '', + has_spec => true, + deployment => 'scap3', + deployment_config => true, + deployment_vars => { + jwt_token => $jwt_secret, + apertium_uri => $apertium_uri, + yandex_key => $yandex_api_key, + youdao_key => $youdao_api_key, + }, + } +} diff --git a/modules/role/manifests/cxserver.pp b/modules/role/manifests/cxserver.pp index 6b877ce..c4441f1 100644 --- a/modules/role/manifests/cxserver.pp +++ b/modules/role/manifests/cxserver.pp @@ -6,15 +6,5 @@ system::role { 'cxserver': description => 'content translation server' } - - include ::passwords::cxserver - $yandex_api_key = $::passwords::cxserver::yandex_api_key - $youdao_api_key = $::passwords::cxserver::youdao_api_key - $jwt_secret = $::passwords::cxserver::jwt_secret - - class { '::cxserver': - yandex_api_key => $yandex_api_key, - youdao_api_key => $youdao_api_key, - jwt_secret => $jwt_secret, - } + include ::profile::cxserver } -- To view, visit https://gerrit.wikimedia.org/r/377206 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I04872168708db65d316c7fb32bfc4dd6f536f97b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
