From 0a976790b975def34b4aad1964e2c769fff97b41 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Thu, 23 Nov 2017 10:04:24 +0000 Subject: [PATCH] Do not implement reload for novnc/spice service The nova-novncproxy and nova-spicehtml5proxy services do not support using a HUP signal to reload, so the init file for them should not implement a reload. Depends-On: Id4b9caa1cdfd0f53023548c4ede5d497d64c873d Change-Id: I36e2200e2ca43d87208d2c4edb17b98654bb121e --- templates/nova-systemd-init.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/nova-systemd-init.j2 b/templates/nova-systemd-init.j2 index 3900d335..0f43c196 100644 --- a/templates/nova-systemd-init.j2 +++ b/templates/nova-systemd-init.j2 @@ -15,7 +15,9 @@ ExecStart={{ item.program_override }} {{ item.program_config_options | default(' {% 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 {% endif %} +{% if item.service_name != nova_services['nova-novncproxy']['service_name'] and item.service_name != nova_services['nova-spicehtml5proxy']['service_name'] %} 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') }} +{% endif %} # Give a reasonable amount of time for the server to start up/shut down TimeoutSec=120