Giuseppe Lavagetto has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/377207 )
Change subject: apertium: move to role/profile ...................................................................... apertium: move to role/profile Change-Id: I65f9890bad802dedee36296bf1b4bbfe309d59e1 --- M hieradata/labs/deployment-prep/common.yaml D modules/apertium/tests/Makefile D modules/apertium/tests/init.pp R modules/profile/manifests/apertium.pp R modules/profile/templates/initscripts/apertium-apy.systemd.erb R modules/profile/templates/initscripts/apertium-apy.upstart.erb M modules/role/manifests/apertium.pp 7 files changed, 26 insertions(+), 45 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/07/377207/1 diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index 26242c7..7a35d08 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -168,7 +168,6 @@ explicit_macs: false disable_agent_forwarding: false challenge_response_auth: false -"role::apertium::apertium_port": 2737 "role::cxserver::cxserver_port": 8080 "misc::syslog-server::basepath": /data/project/syslog "profile::cxserver::apertium_uri": http://apertium-beta.wmflabs.org diff --git a/modules/apertium/tests/Makefile b/modules/apertium/tests/Makefile deleted file mode 100644 index 76cd656..0000000 --- a/modules/apertium/tests/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -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/apertium/tests/init.pp b/modules/apertium/tests/init.pp deleted file mode 100644 index b35284d..0000000 --- a/modules/apertium/tests/init.pp +++ /dev/null @@ -1 +0,0 @@ -include ::apertium diff --git a/modules/apertium/manifests/init.pp b/modules/profile/manifests/apertium.pp similarity index 83% rename from modules/apertium/manifests/init.pp rename to modules/profile/manifests/apertium.pp index 0d97f3e..4345fb1 100644 --- a/modules/apertium/manifests/init.pp +++ b/modules/profile/manifests/apertium.pp @@ -6,21 +6,21 @@ # === Parameters # # [*num_of_processes*] -# Number of APY instance processes to run. -# [*max_idle_seconds*] -# Seconds to wait before shutdown idle process. -# [*uid*] -# The username apertium-apy will run with. -# [*gid*] -# The group apertium-apy will run with. -class apertium( - $num_of_processes = 1, - $max_idle_seconds = 300, - $uid = 'apertium', - $gid = 'apertium', -) { - include ::service::configuration +# [*max_idle_seconds*] +# +class profile::apertium { + require ::service::configuration + + # Port we're listening on + $port = 2737 + # Number of APY instance processes to run. + $num_of_processes = 1 + # Seconds to wait before shutting down an idle process. + $max_idle_seconds = 300 + # User and group + $uid = 'apertium' + $gid = 'apertium' $log_dir = "${::service::configuration::log_dir}/apertium" @@ -134,4 +134,14 @@ not_if_empty => true, rotate => 15, } + + ferm::service { 'apertium_http': + proto => 'tcp', + port => $port, + } + + monitoring::service { 'apertium': + description => 'apertium apy', + check_command => "check_http_hostheader_port_url!apertium.svc.${::site}.wmnet!${port}!/listPairs", + } } diff --git a/modules/apertium/templates/initscripts/apertium-apy.systemd.erb b/modules/profile/templates/initscripts/apertium-apy.systemd.erb similarity index 100% rename from modules/apertium/templates/initscripts/apertium-apy.systemd.erb rename to modules/profile/templates/initscripts/apertium-apy.systemd.erb diff --git a/modules/apertium/templates/initscripts/apertium-apy.upstart.erb b/modules/profile/templates/initscripts/apertium-apy.upstart.erb similarity index 100% rename from modules/apertium/templates/initscripts/apertium-apy.upstart.erb rename to modules/profile/templates/initscripts/apertium-apy.upstart.erb diff --git a/modules/role/manifests/apertium.pp b/modules/role/manifests/apertium.pp index 613bb40..55671d4 100644 --- a/modules/role/manifests/apertium.pp +++ b/modules/role/manifests/apertium.pp @@ -1,23 +1,9 @@ # vim: set ts=4 et sw=4: # # filtertags: labs-project-deployment-prep -class role::apertium( - $port = '2737', -) { +class role::apertium { system::role { 'apertium': description => 'Apertium APY server' } - - include ::apertium - - ferm::service { 'apertium_http': - proto => 'tcp', - port => $port, - } - - monitoring::service { 'apertium': - description => 'apertium apy', - check_command => "check_http_hostheader_port_url!apertium.svc.${::site}.wmnet!${port}!/listPairs", - } - + include ::profile::apertium } -- To view, visit https://gerrit.wikimedia.org/r/377207 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I65f9890bad802dedee36296bf1b4bbfe309d59e1 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
