EBernhardson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/389550 )
Change subject: Deploy MjoLniR with new deploy repository
......................................................................
Deploy MjoLniR with new deploy repository
While we were able to deploy mjolnir relatively naively onto
relforge, as it only needed the kafka deps, deploying to the
analytics cluster needs to be a bit more involved. A deploy
repo mimicing ORES deployment was setup and this deploys it.
This depends on I420c894250 being merged before this can
be deployed.
Change-Id: Idff10716e370462b8cecdbf3298ae9b64566fc25
---
M hieradata/role/common/deployment_server.yaml
M modules/profile/manifests/mjolnir/kafka_daemon.pp
M modules/profile/templates/mjolnir/kafka-daemon.service.erb
M modules/role/manifests/elasticsearch/analytics.pp
4 files changed, 11 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/50/389550/1
diff --git a/hieradata/role/common/deployment_server.yaml
b/hieradata/role/common/deployment_server.yaml
index 8eac2e3..a4b87cc 100644
--- a/hieradata/role/common/deployment_server.yaml
+++ b/hieradata/role/common/deployment_server.yaml
@@ -173,8 +173,8 @@
# Librenms software
librenms/librenms:
repository: operations/software/librenms
- relforge/mjolnir:
- repository: search/MjoLniR
+ search/MjoLniR/deploy:
+ repository: search/MjoLniR/deploy
statsv/statsv:
repository: analytics/statsv
"docker-pkg/deploy":
diff --git a/modules/profile/manifests/mjolnir/kafka_daemon.pp
b/modules/profile/manifests/mjolnir/kafka_daemon.pp
index c1dcaf9..ae8718d 100644
--- a/modules/profile/manifests/mjolnir/kafka_daemon.pp
+++ b/modules/profile/manifests/mjolnir/kafka_daemon.pp
@@ -9,18 +9,15 @@
# it is named just 'eqiad'.
$kafka_config = kafka_config('eqiad'),
) {
- scap::target { 'relforge/mjolnir':
+ scap::target { 'search/MjoLniR/deploy':
deploy_user => 'deploy-service',
}
- # This is a limited subset of what the full mjolnir package requires
because
- # the daemon is a small part of the overall application. The daemon only
needs
- # to read/write kafka topics and send requests to localhost.
- require_package('python-kafka', 'python-requests')
+ require_package('virtualenv', 'zip')
systemd::service { 'mjolnir-kafka-daemon':
content => template('profile/mjolnir/kafka-daemon.service.erb'),
- require => Scap::Target['relforge/mjolnir'],
+ require => Scap::Target['search/MjoLniR/deploy'],
}
}
diff --git a/modules/profile/templates/mjolnir/kafka-daemon.service.erb
b/modules/profile/templates/mjolnir/kafka-daemon.service.erb
index b6947ba..14b5257 100644
--- a/modules/profile/templates/mjolnir/kafka-daemon.service.erb
+++ b/modules/profile/templates/mjolnir/kafka-daemon.service.erb
@@ -5,9 +5,7 @@
[Service]
User=nobody
Group=nogroup
-WorkingDirectory=/srv/deployment/relforge/mjolnir
-Environment=PYTHONPATH=/srv/deployment/relforge/mjolnir
-ExecStart=/usr/bin/python2
/srv/deployment/relforge/mjolnir/mjolnir/cli/kafka_daemon.py --brokers <%=
@kafka_config['brokers']['string'] %>
+ExecStart=/srv/deployment/search/MjoLniR/venv/bin/mjolnir-utilities.py
kafka_daemon --brokers <%= @kafka_config['brokers']['string'] %>
StandardInput=null
StandardOutput=journal
StandardError=journal
diff --git a/modules/role/manifests/elasticsearch/analytics.pp
b/modules/role/manifests/elasticsearch/analytics.pp
index a46391e..ec5ea0b 100644
--- a/modules/role/manifests/elasticsearch/analytics.pp
+++ b/modules/role/manifests/elasticsearch/analytics.pp
@@ -4,4 +4,9 @@
scap::target { 'wikimedia/discovery/analytics':
deploy_user => 'deploy-service',
}
+
+ require_package('virtualenv', 'zip')
+ scap::target { 'search/MjoLniR/deploy':
+ deploy_user => 'deploy-service',
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/389550
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idff10716e370462b8cecdbf3298ae9b64566fc25
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: EBernhardson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
