openstack
/
openstack-ansible-os_cinder
Code Issues Proposed changes

Use cinder_services dict to identify cinder-api service name 

Instead of assuming the name, we use the dict as a reference.
This means it will work, even if someone overrides the dict
for some reason.

Change-Id: I7adae469e725fd0de84d1c75161ceffbe0a63c3e
This commit is contained in:
Jesse Pretorius 2017-11-23 10:11:35 +00:00
parent 882e518d9b
commit 536dd3446e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/cinder-systemd-init.j2
View File

@ -15,7 +15,7 @@ ExecStart={{ item.program_override }} {{ item.program_config_options|default('')
{% else %}
ExecStart={{ cinder_bin }}/{{ item.service_name }} {{ item.program_config_options|default('') }} --log-file=/var/log/cinder/{{ item.service_name }}.log
{% endif %}
{% if item.service_name != "cinder-api" or item.wsgi_app %}
{% if item.service_name != cinder_services['cinder-api']['service_name'] or item.wsgi_app %}
ExecReload={{ (item.wsgi_app is defined and item.wsgi_app) | ternary(cinder_bin + '/uwsgi --reload /var/run/' + item.service_name + '/' + item.service_name +'.pid','/bin/kill -HUP $MAINPID') }}
{% endif %}