openstack/openstack-ansible-os_nova
Code Issues Proposed changes

Merge "Fix reloads for uWSGI"

Browse Source
This commit is contained in:
Jenkins 2017-08-15 17:24:27 +00:00 committed by Gerrit Code Review
commit 7f57d8110b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@ ExecStart={{ item.program_override }} {{ item.program_config_options | default('
{% else %} {% else %}
ExecStart={{ nova_bin }}/{{ item.service_name }} {{ item.program_config_options | default('') }} {{ item.log_string | default('--log-file=') }}/var/log/nova/{{ item.service_name }}.log ExecStart={{ nova_bin }}/{{ item.service_name }} {{ item.program_config_options | default('') }} {{ item.log_string | default('--log-file=') }}/var/log/nova/{{ item.service_name }}.log
{% endif %} {% endif %}
ExecReload=/bin/kill -HUP $MAINPID ExecReload={{ (item.wsgi_app is defined and item.wsgi_app) | ternary(nova_bin + '/uwsgi --reload /var/run/' + item.service_name + '/' + item.service_name +'.pid','/bin/kill -HUP $MAINPID') }}
# Give a reasonable amount of time for the server to start up/shut down # Give a reasonable amount of time for the server to start up/shut down
TimeoutSec=120 TimeoutSec=120

3
templates/nova-uwsgi.ini.j2
View File

@ -11,10 +11,11 @@ master = true
enable-threads = true enable-threads = true
processes = {{ nova_wsgi_processes }} processes = {{ nova_wsgi_processes }}
threads = {{ nova_wsgi_threads }} threads = {{ nova_wsgi_threads }}
exit-on-reload = true exit-on-reload = false
die-on-term = true die-on-term = true
lazy-apps = true lazy-apps = true
add-header = Connection: close add-header = Connection: close
buffer-size = {{ nova_wsgi_buffer_size }} buffer-size = {{ nova_wsgi_buffer_size }}
thunder-lock = true thunder-lock = true
logfile-chmod = 644 logfile-chmod = 644
pidfile = /var/run/{{ item.service_name }}/{{ item.service_name }}.pid