windmill
/
windmill
Code Issues Proposed changes

Remove the need for PREFIX in unit files 

Zuul and nodepool ansible roles have removed this logic, we should
too. The service files will automagically setup the patch to our
virtualenvs.

Change-Id: I75453b72e2e4c9cb3d184f707eec7c2a337430aa
Depends-On: https://review.openstack.org/558966
Depends-On: https://review.openstack.org/558968
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2018-04-04 20:37:41 -04:00
parent 23b607a461
commit 1f62b1a622
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
8 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/group_vars/zuul-fingergw.yaml
View File

@ -13,8 +13,6 @@
# under the License.
---
# windmill.zuul
zuul_file_zuul_fingergw_service_config_src: zuul/etc/systemd/system/zuul-fingergw.service.d/override.conf.j2
zuul_pip_virtualenv_python: python3
zuul_pip_virtualenv: /opt/venv/zuul-fingergw

1
playbooks/templates/nodepool-builder/etc/systemd/system/nodepool-builder.service.d/override.conf.j2
View File

@ -5,4 +5,3 @@
{% if ansible_host | ipv4 %}
Environment="STATSD_HOST={{ hostvars['statsd01'].ansible_host }}"
{% endif %}
Environment="PREFIX={{ nodepool_pip_virtualenv }}"

1
playbooks/templates/nodepool-launcher/etc/systemd/system/nodepool-launcher.service.d/override.conf.j2
View File

@ -5,4 +5,3 @@
{% if ansible_host | ipv4 %}
Environment="STATSD_HOST={{ hostvars['statsd01'].ansible_host }}"
{% endif %}
Environment="PREFIX={{ nodepool_pip_virtualenv }}"

1
playbooks/templates/zuul/etc/systemd/system/zuul-executor.service.d/override.conf.j2
View File

@ -2,6 +2,5 @@
# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
#
[Service]
Environment="PREFIX={{ zuul_pip_virtualenv }}"
Group={{ zuul_user_group }}
User={{ zuul_user_name }}

5
playbooks/templates/zuul/etc/systemd/system/zuul-fingergw.service.d/override.conf.j2
View File

@ -1,5 +0,0 @@
# This file is generated by Ansible
# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
#
[Service]
Environment="PREFIX={{ zuul_pip_virtualenv }}"

1
playbooks/templates/zuul/etc/systemd/system/zuul-merger.service.d/override.conf.j2
View File

@ -2,6 +2,5 @@
# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
#
[Service]
Environment="PREFIX={{ zuul_pip_virtualenv }}"
Group={{ zuul_user_group }}
User={{ zuul_user_name }}

1
playbooks/templates/zuul/etc/systemd/system/zuul-scheduler.service.d/override.conf.j2
View File

@ -2,6 +2,5 @@
# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
#
[Service]
Environment="PREFIX={{ zuul_pip_virtualenv }}"
Group={{ zuul_user_group }}
User={{ zuul_user_name }}

1
playbooks/templates/zuul/etc/systemd/system/zuul-web.service.d/override.conf.j2
View File

@ -2,6 +2,5 @@
# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
#
[Service]
Environment="PREFIX={{ zuul_pip_virtualenv }}"
Group={{ zuul_user_group }}
User={{ zuul_user_name }}