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 dc2ba789c7eec90cd79fd696fa8bb90fc66240ab..7af78d7a52a975212b12c88e19d01f8195b1e754 100644 (file)
--- 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 2a87073de8e6bf238c1277e12b13833bc5e4fa05..938389cfd5455cbe0e0d459526130d2351ad90bf 100644 (file)
--- 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 c1bb08fb6ce8ae580b25abbcee89b1ea28d23acf..fe80fb94e43afe8e7ee042c2083f069d31b8cfdd 100644 (file)
--- 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 e4c781a347f452c40007e6f86c77acb1bd43c2a7..451ce79fb86820b2418087e4a2fe188bec7f6ec7 100644 (file)
--- 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 c62f1d65372e96ad8d360abd3c079dcc3a7b3c1e..5865e65d5ea9926942b31fe4142c8219b642d391 100644 (file)
--- 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 d5c82c39b5b00a44cccd5e7960eaf03ea88f8314..969d9ac680b586f1847ce681bcf3edddab1d8d13 100644 (file)
--- 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 d7caf2d6747a1f4f99518e7e00b619157e712b8a..edb1e3a280217e72ebcb0fd0cb3cb3a5ba0ad4c4 100644 (file)
--- 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 7477e25092b4211b5867d969f17f9f9fd63a54f7..a6792c430d9cb559f5aba5aa0771621680d515a7 100644 (file)
--- 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 81b20486f7c8b9fdcd386c9be5c7e133730578f8..3ef422265d06b2c53640c3f75ff7964676c0389b 100644 (file)
--- 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 9258228417bc0726fa1f3de472c03a3de078f364..62dec41f6bbbc80163501e829880abcfbb0e4e79 100644 (file)
--- 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 b348a5be61ed979081147b51d1a489426c30c6ee..d222d6cd7cd15982bacf47b7b885674558a35894 100644 (file)
--- 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 3c5081c1e6a2346e930f221fdc2c4090d6f776fc..9c6d5c0521d74efac8035922117f75bf9b87fe68 100644 (file)
--- a/centos7/rpm/SPECS/openstack-neutron.spec
+++ b/centos7/rpm/SPECS/openstack-neutron.spec
@@ -2,7 +2,7 @@
 
 Name:           openstack-%{service}
 Version:        8.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 Summary:        OpenStack Networking Service
 
@@ -738,6 +738,8 @@ fi
 
 
 %changelog
+* Mon Jun 6 2016 Sergey Kolekonov <skolekonov@mirantis.com> 1:8.1.1-2.el7
+- Add Restart=always directive for systemd units
 * Thu Jun 2 2016 Jerzy Mikolajczak <jmikolajczak@mirantis.com> 1:8.1.1-1.el7
 - Bump version to 8.1.1
 * Wed May 18 2016 Jerzy Mikolajczak <jmikolajczak@mirantis.com> 1:8.1.0-1.el7