From: Sergey Kolekonov Date: Mon, 6 Jun 2016 16:12:24 +0000 (+0300) Subject: Add Restart=always for Neutron services X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=f51c5f785d61e7bc7ff21dac262b74733462348a;p=openstack-build%2Fneutron-build.git Add Restart=always for Neutron services neutron services should be automatically respawned in case of failure Change-Id: I696a159cf7c7a36d7ec2fcda98a347e4e493551d Closes-bug: #1589565 --- diff --git a/centos7/rpm/SOURCES/neutron-bgp-dragent.service b/centos7/rpm/SOURCES/neutron-bgp-dragent.service index dc2ba789c..7af78d7a5 100644 --- a/centos7/rpm/SOURCES/neutron-bgp-dragent.service +++ b/centos7/rpm/SOURCES/neutron-bgp-dragent.service @@ -8,6 +8,7 @@ User=neutron ExecStart=/usr/bin/neutron-bgp-dragent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-bgp-dragent --log-file /var/log/neutron/bgp-dragent.log PrivateTmp=true KillMode=process +Restart=always [Install] WantedBy=multi-user.target diff --git a/centos7/rpm/SOURCES/neutron-dhcp-agent.service b/centos7/rpm/SOURCES/neutron-dhcp-agent.service index 2a87073de..938389cfd 100644 --- a/centos7/rpm/SOURCES/neutron-dhcp-agent.service +++ b/centos7/rpm/SOURCES/neutron-dhcp-agent.service @@ -8,6 +8,7 @@ User=neutron ExecStart=/usr/bin/neutron-dhcp-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-dhcp-agent --log-file /var/log/neutron/dhcp-agent.log PrivateTmp=false KillMode=process +Restart=always [Install] WantedBy=multi-user.target diff --git a/centos7/rpm/SOURCES/neutron-l3-agent.service b/centos7/rpm/SOURCES/neutron-l3-agent.service index c1bb08fb6..fe80fb94e 100644 --- a/centos7/rpm/SOURCES/neutron-l3-agent.service +++ b/centos7/rpm/SOURCES/neutron-l3-agent.service @@ -8,6 +8,7 @@ User=neutron ExecStart=/usr/bin/neutron-l3-agent --config-dir /usr/share/neutron/l3_agent --config-file /etc/neutron/neutron.conf --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-l3-agent --log-file /var/log/neutron/l3-agent.log PrivateTmp=false KillMode=process +Restart=always [Install] WantedBy=multi-user.target diff --git a/centos7/rpm/SOURCES/neutron-linuxbridge-agent.service b/centos7/rpm/SOURCES/neutron-linuxbridge-agent.service index e4c781a34..451ce79fb 100644 --- a/centos7/rpm/SOURCES/neutron-linuxbridge-agent.service +++ b/centos7/rpm/SOURCES/neutron-linuxbridge-agent.service @@ -8,6 +8,7 @@ User=neutron ExecStart=/usr/bin/neutron-linuxbridge-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/linuxbridge_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-linuxbridge-agent --log-file /var/log/neutron/linuxbridge-agent.log PrivateTmp=true KillMode=process +Restart=always [Install] WantedBy=multi-user.target diff --git a/centos7/rpm/SOURCES/neutron-macvtap-agent.service b/centos7/rpm/SOURCES/neutron-macvtap-agent.service index c62f1d653..5865e65d5 100644 --- a/centos7/rpm/SOURCES/neutron-macvtap-agent.service +++ b/centos7/rpm/SOURCES/neutron-macvtap-agent.service @@ -8,6 +8,7 @@ User=neutron ExecStart=/usr/bin/neutron-macvtap-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-macvtap-agent --log-file /var/log/neutron/macvtap-agent.log PrivateTmp=true KillMode=process +Restart=always [Install] WantedBy=multi-user.target diff --git a/centos7/rpm/SOURCES/neutron-metadata-agent.service b/centos7/rpm/SOURCES/neutron-metadata-agent.service index d5c82c39b..969d9ac68 100644 --- a/centos7/rpm/SOURCES/neutron-metadata-agent.service +++ b/centos7/rpm/SOURCES/neutron-metadata-agent.service @@ -8,6 +8,7 @@ User=neutron ExecStart=/usr/bin/neutron-metadata-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metadata_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-metadata-agent --log-file /var/log/neutron/metadata-agent.log PrivateTmp=false KillMode=process +Restart=always [Install] WantedBy=multi-user.target diff --git a/centos7/rpm/SOURCES/neutron-metering-agent.service b/centos7/rpm/SOURCES/neutron-metering-agent.service index d7caf2d67..edb1e3a28 100644 --- a/centos7/rpm/SOURCES/neutron-metering-agent.service +++ b/centos7/rpm/SOURCES/neutron-metering-agent.service @@ -8,6 +8,7 @@ User=neutron ExecStart=/usr/bin/neutron-metering-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metering_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-metering-agent --log-file /var/log/neutron/metering-agent.log PrivateTmp=false KillMode=process +Restart=always [Install] WantedBy=multi-user.target diff --git a/centos7/rpm/SOURCES/neutron-openvswitch-agent.service b/centos7/rpm/SOURCES/neutron-openvswitch-agent.service index 7477e2509..a6792c430 100644 --- a/centos7/rpm/SOURCES/neutron-openvswitch-agent.service +++ b/centos7/rpm/SOURCES/neutron-openvswitch-agent.service @@ -9,6 +9,7 @@ User=neutron ExecStart=/usr/bin/neutron-openvswitch-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-openvswitch-agent --log-file /var/log/neutron/openvswitch-agent.log PrivateTmp=true KillMode=process +Restart=always [Install] WantedBy=multi-user.target diff --git a/centos7/rpm/SOURCES/neutron-rpc-server.service b/centos7/rpm/SOURCES/neutron-rpc-server.service index 81b20486f..3ef422265 100644 --- a/centos7/rpm/SOURCES/neutron-rpc-server.service +++ b/centos7/rpm/SOURCES/neutron-rpc-server.service @@ -9,6 +9,7 @@ ExecStart=/usr/bin/neutron-rpc-server --config-dir /usr/share/neutron/server --c PrivateTmp=true NotifyAccess=all KillMode=process +Restart=always [Install] WantedBy=multi-user.target diff --git a/centos7/rpm/SOURCES/neutron-server.service b/centos7/rpm/SOURCES/neutron-server.service index 925822841..62dec41f6 100644 --- a/centos7/rpm/SOURCES/neutron-server.service +++ b/centos7/rpm/SOURCES/neutron-server.service @@ -9,6 +9,7 @@ ExecStart=/usr/bin/neutron-server --config-dir /usr/share/neutron/server --confi PrivateTmp=true NotifyAccess=all KillMode=process +Restart=always [Install] WantedBy=multi-user.target diff --git a/centos7/rpm/SOURCES/neutron-sriov-nic-agent.service b/centos7/rpm/SOURCES/neutron-sriov-nic-agent.service index b348a5be6..d222d6cd7 100644 --- a/centos7/rpm/SOURCES/neutron-sriov-nic-agent.service +++ b/centos7/rpm/SOURCES/neutron-sriov-nic-agent.service @@ -8,6 +8,7 @@ User=neutron ExecStart=/usr/bin/neutron-sriov-nic-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/sriov_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-sriov-nic-agent --log-file /var/log/neutron/sriov-nic-agent.log PrivateTmp=false KillMode=process +Restart=always [Install] WantedBy=multi-user.target diff --git a/centos7/rpm/SPECS/openstack-neutron.spec b/centos7/rpm/SPECS/openstack-neutron.spec index 756537008..5fdc1da32 100644 --- a/centos7/rpm/SPECS/openstack-neutron.spec +++ b/centos7/rpm/SPECS/openstack-neutron.spec @@ -1,7 +1,7 @@ %global service neutron Name: openstack-%{service} -Version: 9.0.0~b1 +Version: 9.0.0~b2 Release: 1%{?dist} Epoch: 1 Summary: OpenStack Networking Service @@ -726,6 +726,8 @@ fi %changelog +* Mon Jul 18 2016 Sergey Kolekonov 1:9.0.0~b2-1.el7 +- Add Restart=always directive for systemd units * Mon Jun 27 2016 Jerzy Mikolajczak 1:9.0.0.0b1-1.el7 - Update specs for Newton b1 release - Remove neutron-bgp-dragent service