windmill/ansible-role-zuul
Code Issues Proposed changes

Remove PREFIX from service files

Browse Source 
This was really to work around the need not to template our service
files.  Mostly because I was scared how large and unmanageable they
would become.  Let ansible do its job and remove the hacks we had in
our systemd unit file.

Change-Id: I5ae753d7c2a2d068750bd29400e7b736cc33df39
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2018-04-04 20:32:33 -04:00
parent 83d425bdb3
commit 7e2a53bdcd
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
6 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
files/etc/default/zuul-web
View File

@ -1,10 +0,0 @@
# This file is generated by Ansible
# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
#
# The prefix used when zuul-scheduler was installed. Be sure to update this value
# if you are using a virtualenv.
PREFIX=/usr/local
# The user used to start zuul-scheduler service.
RUNASUSER=zuul

5
templates/etc/systemd/system/zuul-executor.service
View File

@ -4,11 +4,10 @@ After=syslog.target network.target
[Service] [Service]
Type=simple Type=simple
Environment="PREFIX=/usr/local"
Group=zuul Group=zuul
User=zuul User=zuul
ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-executor -d" ExecStart={{ zuul_pip_virtualenv | default('/usr/local') }}/bin/zuul-executor -d
ExecStop=/bin/sh -c "${PREFIX}/bin/zuul-executor stop" ExecStop={{ zuul_pip_virtualenv | default('/usr/local') }}/bin/zuul-executor stop
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

5
templates/etc/systemd/system/zuul-fingergw.service
View File

@ -4,11 +4,10 @@ After=syslog.target network.target
[Service] [Service]
Type=simple Type=simple
Environment="PREFIX=/usr/local"
Group=root Group=root
User=root User=root
ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-fingergw -d" ExecStart={{ zuul_pip_virtualenv | default('/usr/local') }}/bin/zuul-fingergw -d
ExecStop=/bin/sh -c "${PREFIX}/bin/zuul-fingergw stop" ExecStop={{ zuul_pip_virtualenv | default('/usr/local') }}/bin/zuul-fingergw stop
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

5
templates/etc/systemd/system/zuul-merger.service
View File

@ -4,11 +4,10 @@ After=syslog.target network.target
[Service] [Service]
Type=simple Type=simple
Environment="PREFIX=/usr/local"
Group=zuul Group=zuul
User=zuul User=zuul
ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-merger -d" ExecStart={{ zuul_pip_virtualenv | default('/usr/local') }}/bin/zuul-merger -d
ExecStop=/bin/sh -c "${PREFIX}/bin/zuul-merger stop" ExecStop={{ zuul_pip_virtualenv | default('/usr/local') }}/bin/zuul-merger stop
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

5
templates/etc/systemd/system/zuul-scheduler.service
View File

@ -4,11 +4,10 @@ After=syslog.target network.target
[Service] [Service]
Type=simple Type=simple
Environment="PREFIX=/usr/local"
Group=zuul Group=zuul
User=zuul User=zuul
ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-scheduler -d" ExecStart={{ zuul_pip_virtualenv | default('/usr/local') }}/bin/zuul-scheduler -d
ExecStop=/bin/sh -c "${PREFIX}/bin/zuul-scheduler stop" ExecStop={{ zuul_pip_virtualenv | default('/usr/local') }}/bin/zuul-scheduler stop
ExecReload=/bin/kill -HUP $MAINPID ExecReload=/bin/kill -HUP $MAINPID
[Install] [Install]

3
templates/etc/systemd/system/zuul-web.service
View File

@ -4,10 +4,9 @@ After=syslog.target network.target
[Service] [Service]
Type=simple Type=simple
Environment="PREFIX=/usr/local"
Group=zuul Group=zuul
User=zuul User=zuul
ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-web -d" ExecStart={{ zuul_pip_virtualenv | default('/usr/local') }}/bin/zuul-web -d
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target