[openstack-neutron/f20: 56/56] Merge branch 'el6-havana' into f20

Ihar Hrachyshka ihrachyshka at fedoraproject.org
Tue Sep 23 09:55:35 UTC 2014 

commit bc8a3672b6977f80320feeb1f22e948d22ebfed5
Merge: a2251de d9fa466
Author: Ihar Hrachyshka <ihrachys at redhat.com>
Date:   Tue Sep 23 11:18:43 2014 +0200

    Merge branch 'el6-havana' into f20
    
    Conflicts:
    	.gitignore
    	openstack-neutron.spec
    	sources

 ...-use-parallel-installed-versions-in-RHEL6.patch |   54 ++
 0002-Remove-dnsmasq-version-warning.patch          |   31 ++
 ...e-and-systemd-modules-from-oslo-incubator.patch |  151 ++++++
 0004-Removed-signing_dir-from-neutron.conf.patch   |   27 +
 ...DR-given-as-ip-prefix-in-security-group-r.patch |  256 ++++++++++
 ....10-raises-ValueError-instead-of-AddrForm.patch |   30 ++
 ...ing-key-is-specified-in-the-address-for-a.patch |   35 ++
 0008-Install-SNAT-rules-for-ipv4-only.patch        |  209 ++++++++
 0009-no-quota-for-allowed-address-pair.patch       |  123 +++++
 neutron-db-check                                   |   41 ++
 neutron-dhcp-agent.init                            |  100 ++++
 neutron-dhcp-agent.upstart                         |    8 +
 neutron-l3-agent.init                              |  101 ++++
 neutron-l3-agent.upstart                           |    8 +
 neutron-lbaas-agent.init                           |  100 ++++
 neutron-lbaas-agent.upstart                        |    8 +
 neutron-linuxbridge-agent.init                     |  100 ++++
 neutron-linuxbridge-agent.upstart                  |    8 +
 neutron-metadata-agent.init                        |  100 ++++
 neutron-metadata-agent.upstart                     |    9 +
 neutron-metering-agent.init                        |  100 ++++
 neutron-metering-agent.upstart                     |    8 +
 neutron-mlnx-agent.init                            |  100 ++++
 neutron-mlnx-agent.upstart                         |    8 +
 neutron-nec-agent.init                             |  100 ++++
 neutron-nec-agent.upstart                          |    8 +
 neutron-openvswitch-agent.init                     |  100 ++++
 neutron-openvswitch-agent.upstart                  |    8 +
 neutron-ovs-cleanup.init                           |   48 ++
 neutron-ovs-cleanup.upstart                        |    7 +
 neutron-ryu-agent.init                             |  100 ++++
 neutron-ryu-agent.upstart                          |    8 +
 neutron-server.init                                |  105 ++++
 neutron-server.upstart                             |   14 +
 neutron-vpn-agent.init                             |  102 ++++
 neutron-vpn-agent.upstart                          |    8 +
 openstack-neutron.spec                             |  505 +++++++++++++++-----
 openstack-neutron.sysconfig                        |    1 +
 38 files changed, 2708 insertions(+), 121 deletions(-)
---
diff --cc openstack-neutron.spec
index 963dc6f,6bffa11..a21b7d2
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@@ -1,10 -1,11 +1,10 @@@
  %global release_name havana
  
  Name:		openstack-neutron
 -Version:	2013.2.3
 -Release:	11%{?dist}
 +Version:	2013.2.4
- Release:	1%{?dist}
++Release:	2%{?dist}
  Provides:	openstack-quantum = %{version}-%{release}
 -Obsoletes:	openstack-quantum < 2013.2-0.3.b3
 -
 +Obsoletes:	openstack-quantum < 2013.2-0.4.b3
  Summary:	OpenStack Networking Service
  
  Group:		Applications/System
@@@ -18,48 -19,84 +18,88 @@@ Source4:	neutron-server-setu
  Source5:	neutron-node-setup
  Source6:	neutron-dhcp-setup
  Source7:	neutron-l3-setup
+ 
 -Source10:	neutron-server.init
 -Source20:	neutron-server.upstart
 -Source11:	neutron-linuxbridge-agent.init
 -Source21:	neutron-linuxbridge-agent.upstart
 -Source12:	neutron-openvswitch-agent.init
 -Source22:	neutron-openvswitch-agent.upstart
 -Source13:	neutron-ryu-agent.init
 -Source23:	neutron-ryu-agent.upstart
 -Source14:	neutron-nec-agent.init
 -Source24:	neutron-nec-agent.upstart
 -Source15:	neutron-dhcp-agent.init
 -Source25:	neutron-dhcp-agent.upstart
 -Source16:	neutron-l3-agent.init
 -Source26:	neutron-l3-agent.upstart
 -Source17:	neutron-metadata-agent.init
 -Source27:	neutron-metadata-agent.upstart
 -Source18:	neutron-ovs-cleanup.init
 -Source28:	neutron-ovs-cleanup.upstart
 -Source19:	neutron-lbaas-agent.init
 -Source29:	neutron-lbaas-agent.upstart
 -Source30:	neutron-mlnx-agent.init
 -Source40:	neutron-mlnx-agent.upstart
 -Source31:	neutron-vpn-agent.init
 -Source41:	neutron-vpn-agent.upstart
 -Source32:	neutron-metering-agent.init
 -Source42:	neutron-metering-agent.upstart
 -
 -Source50:   neutron-db-check
 -Source51:   openstack-neutron.sysconfig
 -
 -Source90:	neutron-dist.conf
 -#
 -# patches_base=2013.2.3+1
 -#
 -Patch0001: 0001-use-parallel-installed-versions-in-RHEL6.patch
 -Patch0002: 0002-Remove-dnsmasq-version-warning.patch
 -Patch0003: 0003-Sync-service-and-systemd-modules-from-oslo-incubator.patch
 -Patch0004: 0004-Removed-signing_dir-from-neutron.conf.patch
 -Patch0005: 0005-Validate-CIDR-given-as-ip-prefix-in-security-group-r.patch
 -Patch0006: 0006-netaddr-0.7.10-raises-ValueError-instead-of-AddrForm.patch
 -Patch0007: 0007-Ensure-routing-key-is-specified-in-the-address-for-a.patch
 -Patch0008: 0008-Install-SNAT-rules-for-ipv4-only.patch
 -Patch0009: 0009-no-quota-for-allowed-address-pair.patch
++# systemd units
 +Source10:	neutron-server.service
 +Source11:	neutron-linuxbridge-agent.service
 +Source12:	neutron-openvswitch-agent.service
 +Source13:	neutron-ryu-agent.service
 +Source14:	neutron-nec-agent.service
 +Source15:	neutron-dhcp-agent.service
 +Source16:	neutron-l3-agent.service
 +Source17:	neutron-metadata-agent.service
 +Source18:	neutron-ovs-cleanup.service
 +Source19:	neutron-lbaas-agent.service
 +Source20:	neutron-mlnx-agent.service
 +Source21:	neutron-vpn-agent.service
 +Source22:	neutron-metering-agent.service
 +
- Source30:	neutron-dist.conf
++# sysv
++Source30:	neutron-server.init
++Source31:	neutron-linuxbridge-agent.init
++Source32:	neutron-openvswitch-agent.init
++Source33:	neutron-ryu-agent.init
++Source34:	neutron-nec-agent.init
++Source35:	neutron-dhcp-agent.init
++Source36:	neutron-l3-agent.init
++Source37:	neutron-metadata-agent.init
++Source38:	neutron-ovs-cleanup.init
++Source39:	neutron-lbaas-agent.init
++Source40:	neutron-mlnx-agent.init
++Source41:	neutron-vpn-agent.init
++Source42:	neutron-metering-agent.init
++
++# upstart
++Source50:	neutron-server.upstart
++Source51:	neutron-linuxbridge-agent.upstart
++Source52:	neutron-openvswitch-agent.upstart
++Source53:	neutron-ryu-agent.upstart
++Source54:	neutron-nec-agent.upstart
++Source55:	neutron-dhcp-agent.upstart
++Source56:	neutron-l3-agent.upstart
++Source57:	neutron-metadata-agent.upstart
++Source58:	neutron-ovs-cleanup.upstart
++Source59:	neutron-lbaas-agent.upstart
++Source60:	neutron-mlnx-agent.upstart
++Source61:	neutron-vpn-agent.upstart
++Source62:	neutron-metering-agent.upstart
++
++Source70:	neutron-dist.conf
++Source71:	neutron-db-check
++Source72:	openstack-neutron.sysconfig
 +
 +Patch0001: 0001-Sync-service-and-systemd-modules-from-oslo-incubator.patch
 +Patch0002: 0002-Removed-signing_dir-from-neutron.conf.patch
 +Patch0003: 0003-Notify-systemd-when-starting-Neutron-server.patch
  
  BuildArch:	noarch
  
  BuildRequires:	python2-devel
  BuildRequires:	python-setuptools
- BuildRequires:	systemd-units
 -# Build require these parallel versions
 -# as setup.py build imports neutron.openstack.common.setup
 -# which will then check for these
 -BuildRequires:	python-sqlalchemy0.7
 -BuildRequires:	python-webob1.2
 -BuildRequires:	python-paste-deploy1.5
 -BuildRequires:	python-routes1.12
 -BuildRequires:	python-jinja2-26
 -BuildRequires:	dos2unix
 -BuildRequires:	python-pbr
 -BuildRequires:	python-d2to1
 -
 +BuildRequires:  python-pbr
 +BuildRequires:  python-d2to1
  
 -Requires:	dnsmasq-utils
  Requires:	python-neutron = %{version}-%{release}
  Requires:	openstack-utils
- Requires:	python-pbr
 -Requires:	python-keystone
 -Requires:	python-pbr
+ 
 -Requires(post):		chkconfig
 -Requires(postun):	initscripts
 -Requires(preun):	chkconfig
 -Requires(preun):	initscripts
 -Requires(pre):		shadow-utils
++%if 0%{?rhel} == 6
++Requires(post):        chkconfig
++Requires(postun):      initscripts
++Requires(preun):       chkconfig
++Requires(preun):       initscripts
++%else
++BuildRequires:         systemd-units
++Requires(post):        systemd-units
++Requires(preun):       systemd-units
++Requires(postun):      systemd-units
++%endif
++Requires(pre):	shadow-utils
  
  # dnsmasq is not a hard requirement, but is currently the only option
  # when neutron-dhcp-agent is deployed.
  Requires:	dnsmasq
 +Requires:	dnsmasq-utils
  
- Requires(pre):	shadow-utils
- Requires(post): systemd-units
- Requires(preun): systemd-units
- Requires(postun): systemd-units
- 
  
  %description
  Neutron is a virtual network service for Openstack. Just like
@@@ -87,20 -124,20 +127,20 @@@ Requires:	python-eventle
  Requires:	python-greenlet
  Requires:	python-httplib2
  Requires:	python-iso8601
 -Requires:	python-jinja2-26
++Requires:	python-jinja2
  Requires:	python-keystoneclient
  Requires:	python-kombu
 -Requires:	python-lxml
 -Requires:	python-paste-deploy1.5
 -Requires:	python-routes1.12
 -Requires:	python-sqlalchemy0.7
 -Requires:	python-webob1.2
  Requires:	python-netaddr
++Requires:	python-neutronclient >= 2.3.4
  Requires:	python-oslo-config >= 1:1.2.0
 +Requires:	python-paste-deploy
  Requires:	python-qpid
- Requires:	python-neutronclient >= 2.3.4
 -Requires:	python-neutronclient >= 2.3.0
 +Requires:	python-routes
 +Requires:	python-sqlalchemy
 +Requires:	python-webob
  Requires:	sudo
  
 +
- 
  %description -n python-neutron
  Neutron provides an API to dynamically request and configure virtual
  networks.
@@@ -221,13 -258,13 +261,13 @@@ networks using MidoNet from Midokura
  
  
  %package -n openstack-neutron-ml2
- Summary:    Neutron ML2 plugin
- Group:      Applications/System
+ Summary:	Neutron ML2 plugin
+ Group:		Applications/System
  
  Provides:	openstack-quantum-ml2 = %{version}-%{release}
 -Obsoletes:	openstack-quantum-ml2 < 2013.2-0.3.b3
 +Obsoletes:	openstack-quantum-ml2 < 2013.2-0.4.b3
  
- Requires:   openstack-neutron = %{version}-%{release}
+ Requires:	openstack-neutron = %{version}-%{release}
  
  
  %description -n openstack-neutron-ml2
@@@ -240,13 -277,13 +280,13 @@@ for accessing those types
  
  
  %package -n openstack-neutron-mellanox
- Summary:    Neutron Mellanox plugin
- Group:      Applications/System
+ Summary:	Neutron Mellanox plugin
+ Group:		Applications/System
  
  Provides:	openstack-quantum-mellanox = %{version}-%{release}
 -Obsoletes:	openstack-quantum-mellanox < 2013.2-0.3.b3
 +Obsoletes:	openstack-quantum-mellanox < 2013.2-0.4.b3
  
- Requires:      openstack-neutron = %{version}-%{release}
+ Requires:	openstack-neutron = %{version}-%{release}
  
  
  %description -n openstack-neutron-mellanox
@@@ -367,8 -404,8 +407,9 @@@ networks using multiple other neutron p
  Summary:	Neutron bandwidth metering agent
  Group:		Applications/System
  
- Requires:   openstack-neutron = %{version}-%{release}
+ Requires:	openstack-neutron = %{version}-%{release}
+ 
 +
  %description -n openstack-neutron-metering-agent
  Neutron provides an API to measure bandwidth utilization
  
@@@ -380,8 -417,7 +421,8 @@@ Summary:	Neutron VPNaaS agen
  Group:		Applications/System
  
  Requires:	openstack-neutron = %{version}-%{release}
- Requires:	python-jinja2
+ 
 +
  %description -n openstack-neutron-vpn-agent
  Neutron provides an API to implement VPN as a service
  
@@@ -426,7 -468,7 +467,7 @@@ while read name eq value; d
    else
      sed -ri "0,/^(#)? *$name *=/{s!^(#)? *$name *=.*!# $name = $value!}" etc/neutron.conf
    fi
- done < %{SOURCE30}
 -done < %{SOURCE90}
++done < %{SOURCE70}
  
  %install
  %{__python} setup.py install -O1 --skip-build --root %{buildroot}
@@@ -458,24 -497,26 +499,57 @@@ install -p -D -m 644 %{SOURCE1} %{build
  # Install sudoers
  install -p -D -m 440 %{SOURCE2} %{buildroot}%{_sysconfdir}/sudoers.d/neutron
  
++%if 0%{?rhel} == 6
+ # Install sysv init scripts
 -install -p -D -m 755 %{SOURCE10} %{buildroot}%{_initrddir}/neutron-server
 -install -p -D -m 755 %{SOURCE11} %{buildroot}%{_initrddir}/neutron-linuxbridge-agent
 -install -p -D -m 755 %{SOURCE12} %{buildroot}%{_initrddir}/neutron-openvswitch-agent
 -install -p -D -m 755 %{SOURCE13} %{buildroot}%{_initrddir}/neutron-ryu-agent
 -install -p -D -m 755 %{SOURCE14} %{buildroot}%{_initrddir}/neutron-nec-agent
 -install -p -D -m 755 %{SOURCE15} %{buildroot}%{_initrddir}/neutron-dhcp-agent
 -install -p -D -m 755 %{SOURCE16} %{buildroot}%{_initrddir}/neutron-l3-agent
 -install -p -D -m 755 %{SOURCE17} %{buildroot}%{_initrddir}/neutron-metadata-agent
 -install -p -D -m 755 %{SOURCE18} %{buildroot}%{_initrddir}/neutron-ovs-cleanup
 -install -p -D -m 755 %{SOURCE19} %{buildroot}%{_initrddir}/neutron-lbaas-agent
 -install -p -D -m 755 %{SOURCE30} %{buildroot}%{_initrddir}/neutron-mlnx-agent
 -install -p -D -m 755 %{SOURCE31} %{buildroot}%{_initrddir}/neutron-vpn-agent
 -install -p -D -m 755 %{SOURCE32} %{buildroot}%{_initrddir}/neutron-metering-agent
++install -p -D -m 755 %{SOURCE30} %{buildroot}%{_initrddir}/neutron-server
++install -p -D -m 755 %{SOURCE31} %{buildroot}%{_initrddir}/neutron-linuxbridge-agent
++install -p -D -m 755 %{SOURCE32} %{buildroot}%{_initrddir}/neutron-openvswitch-agent
++install -p -D -m 755 %{SOURCE33} %{buildroot}%{_initrddir}/neutron-ryu-agent
++install -p -D -m 755 %{SOURCE34} %{buildroot}%{_initrddir}/neutron-nec-agent
++install -p -D -m 755 %{SOURCE35} %{buildroot}%{_initrddir}/neutron-dhcp-agent
++install -p -D -m 755 %{SOURCE36} %{buildroot}%{_initrddir}/neutron-l3-agent
++install -p -D -m 755 %{SOURCE37} %{buildroot}%{_initrddir}/neutron-metadata-agent
++install -p -D -m 755 %{SOURCE38} %{buildroot}%{_initrddir}/neutron-ovs-cleanup
++install -p -D -m 755 %{SOURCE39} %{buildroot}%{_initrddir}/neutron-lbaas-agent
++install -p -D -m 755 %{SOURCE40} %{buildroot}%{_initrddir}/neutron-mlnx-agent
++install -p -D -m 755 %{SOURCE41} %{buildroot}%{_initrddir}/neutron-vpn-agent
++install -p -D -m 755 %{SOURCE42} %{buildroot}%{_initrddir}/neutron-metering-agent
++# Install upstart jobs examples
++install -p -m 644 %{SOURCE50} %{buildroot}%{_datadir}/neutron/
++install -p -m 644 %{SOURCE51} %{buildroot}%{_datadir}/neutron/
++install -p -m 644 %{SOURCE52} %{buildroot}%{_datadir}/neutron/
++install -p -m 644 %{SOURCE53} %{buildroot}%{_datadir}/neutron/
++install -p -m 644 %{SOURCE54} %{buildroot}%{_datadir}/neutron/
++install -p -m 644 %{SOURCE55} %{buildroot}%{_datadir}/neutron/
++install -p -m 644 %{SOURCE56} %{buildroot}%{_datadir}/neutron/
++install -p -m 644 %{SOURCE57} %{buildroot}%{_datadir}/neutron/
++install -p -m 644 %{SOURCE58} %{buildroot}%{_datadir}/neutron/
++install -p -m 644 %{SOURCE59} %{buildroot}%{_datadir}/neutron/
++install -p -m 644 %{SOURCE60} %{buildroot}%{_datadir}/neutron/
++install -p -m 644 %{SOURCE61} %{buildroot}%{_datadir}/neutron/
++install -p -m 644 %{SOURCE62} %{buildroot}%{_datadir}/neutron/
++%else
 +# Install systemd units
 +install -p -D -m 644 %{SOURCE10} %{buildroot}%{_unitdir}/neutron-server.service
 +install -p -D -m 644 %{SOURCE11} %{buildroot}%{_unitdir}/neutron-linuxbridge-agent.service
 +install -p -D -m 644 %{SOURCE12} %{buildroot}%{_unitdir}/neutron-openvswitch-agent.service
 +install -p -D -m 644 %{SOURCE13} %{buildroot}%{_unitdir}/neutron-ryu-agent.service
 +install -p -D -m 644 %{SOURCE14} %{buildroot}%{_unitdir}/neutron-nec-agent.service
 +install -p -D -m 644 %{SOURCE15} %{buildroot}%{_unitdir}/neutron-dhcp-agent.service
 +install -p -D -m 644 %{SOURCE16} %{buildroot}%{_unitdir}/neutron-l3-agent.service
 +install -p -D -m 644 %{SOURCE17} %{buildroot}%{_unitdir}/neutron-metadata-agent.service
 +install -p -D -m 644 %{SOURCE18} %{buildroot}%{_unitdir}/neutron-ovs-cleanup.service
 +install -p -D -m 644 %{SOURCE19} %{buildroot}%{_unitdir}/neutron-lbaas-agent.service
 +install -p -D -m 644 %{SOURCE20} %{buildroot}%{_unitdir}/neutron-mlnx-agent.service
 +install -p -D -m 644 %{SOURCE21} %{buildroot}%{_unitdir}/neutron-vpn-agent.service
 +install -p -D -m 644 %{SOURCE22} %{buildroot}%{_unitdir}/neutron-metering-agent.service
++%endif
  
  # Setup directories
+ install -d -m 755 %{buildroot}%{_datadir}/neutron
  install -d -m 755 %{buildroot}%{_sharedstatedir}/neutron
  install -d -m 755 %{buildroot}%{_localstatedir}/log/neutron
+ install -d -m 755 %{buildroot}%{_localstatedir}/run/neutron
  
  # Install setup helper scripts
  install -p -D -m 755 %{SOURCE4} %{buildroot}%{_bindir}/neutron-server-setup
@@@ -483,8 -524,29 +557,13 @@@ install -p -D -m 755 %{SOURCE5} %{build
  install -p -D -m 755 %{SOURCE6} %{buildroot}%{_bindir}/neutron-dhcp-setup
  install -p -D -m 755 %{SOURCE7} %{buildroot}%{_bindir}/neutron-l3-setup
  
 -# Install upstart jobs examples
 -install -p -m 644 %{SOURCE20} %{buildroot}%{_datadir}/neutron/
 -install -p -m 644 %{SOURCE21} %{buildroot}%{_datadir}/neutron/
 -install -p -m 644 %{SOURCE22} %{buildroot}%{_datadir}/neutron/
 -install -p -m 644 %{SOURCE23} %{buildroot}%{_datadir}/neutron/
 -install -p -m 644 %{SOURCE24} %{buildroot}%{_datadir}/neutron/
 -install -p -m 644 %{SOURCE25} %{buildroot}%{_datadir}/neutron/
 -install -p -m 644 %{SOURCE26} %{buildroot}%{_datadir}/neutron/
 -install -p -m 644 %{SOURCE27} %{buildroot}%{_datadir}/neutron/
 -install -p -m 644 %{SOURCE28} %{buildroot}%{_datadir}/neutron/
 -install -p -m 644 %{SOURCE29} %{buildroot}%{_datadir}/neutron/
 -install -p -m 644 %{SOURCE40} %{buildroot}%{_datadir}/neutron/
 -install -p -m 644 %{SOURCE41} %{buildroot}%{_datadir}/neutron/
 -install -p -m 644 %{SOURCE42} %{buildroot}%{_datadir}/neutron/
 -
  # Install dist conf
- install -p -D -m 640 %{SOURCE30} %{buildroot}%{_datadir}/neutron/neutron-dist.conf
 -install -p -D -m 640 %{SOURCE90} %{buildroot}%{_datadir}/neutron/neutron-dist.conf
++install -p -D -m 640 %{SOURCE70} %{buildroot}%{_datadir}/neutron/neutron-dist.conf
+ 
+ # Install neutron-db-check
 -install -m 755 %{SOURCE50} %{buildroot}%{_bindir}/neutron-db-check
++install -m 755 %{SOURCE71} %{buildroot}%{_bindir}/neutron-db-check
+ install -d -m 755 %{buildroot}%{_sysconfdir}/sysconfig
 -install -m 644 %{SOURCE51} %{buildroot}%{_sysconfdir}/sysconfig/openstack-neutron
 -
++install -m 644 %{SOURCE72} %{buildroot}%{_sysconfdir}/sysconfig/openstack-neutron
  
  # Install version info file
  cat > %{buildroot}%{_sysconfdir}/neutron/release <<EOF
@@@ -494,199 -556,229 +573,323 @@@ product = OpenStack Neutro
  package = %{release}
  EOF
  
++
  %pre
  getent group neutron >/dev/null || groupadd -r neutron
  getent passwd neutron >/dev/null || \
--    useradd -r -g neutron -d %{_sharedstatedir}/neutron -s /sbin/nologin \
++    useradd -r -g neutron -d %{_sharedstatedir}/neutron -s /sbin/nologin
++\
      -c "OpenStack Neutron Daemons" neutron
  exit 0
  
  
  %post
++%if 0%{?rhel} == 6
  if [ $1 -eq 1 ] ; then
      # Initial installation
-     /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+     /sbin/chkconfig --add neutron-server
+     for agent in dhcp l3 metadata lbaas; do
+       /sbin/chkconfig --add neutron-$agent-agent
+     done
  fi
- 
++%else
++%systemd_post neutron-dhcp-agent.service
++%systemd_post neutron-l3-agent.service
++%systemd_post neutron-metadata-agent.service
++%systemd_post neutron-lbaas-agent.service
++%systemd_post neutron-server.service
++%endif
  
  %preun
++%if 0%{?rhel} == 6
  if [ $1 -eq 0 ] ; then
      # Package removal, not upgrade
-     /bin/systemctl --no-reload disable neutron-server.service > /dev/null 2>&1 || :
-     /bin/systemctl stop neutron-server.service > /dev/null 2>&1 || :
-     /bin/systemctl --no-reload disable neutron-dhcp-agent.service > /dev/null 2>&1 || :
-     /bin/systemctl stop neutron-dhcp-agent.service > /dev/null 2>&1 || :
-     /bin/systemctl --no-reload disable neutron-l3-agent.service > /dev/null 2>&1 || :
-     /bin/systemctl stop neutron-l3-agent.service > /dev/null 2>&1 || :
-     /bin/systemctl --no-reload disable neutron-metadata-agent.service > /dev/null 2>&1 || :
-     /bin/systemctl stop neutron-metadata-agent.service > /dev/null 2>&1 || :
-     /bin/systemctl --no-reload disable neutron-lbaas-agent.service > /dev/null 2>&1 || :
-     /bin/systemctl stop neutron-lbaas-agent.service > /dev/null 2>&1 || :
+     /sbin/service neutron-server stop >/dev/null 2>&1
+     /sbin/chkconfig --del neutron-server
 -    for agent in dhcp l3 metadata lbaas; do
++    for agent in dhcp l3 lbaas metadata; do
+       /sbin/service neutron-$agent-agent stop >/dev/null 2>&1
+       /sbin/chkconfig --del neutron-$agent-agent
+     done
  fi
++%else
++%systemd_preun neutron-dhcp-agent.service
++%systemd_preun neutron-l3-agent.service
++%systemd_preun neutron-metadata-agent.service
++%systemd_preun neutron-lbaas-agent.service
++%systemd_preun neutron-server.service
++%endif
 +
  
  %postun
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
++%if 0%{?rhel} == 6
  if [ $1 -ge 1 ] ; then
      # Package upgrade, not uninstall
-     /bin/systemctl try-restart neutron-server.service >/dev/null 2>&1 || :
-     /bin/systemctl try-restart neutron-dhcp-agent.service >/dev/null 2>&1 || :
-     /bin/systemctl try-restart neutron-l3-agent.service >/dev/null 2>&1 || :
-     /bin/systemctl try-restart neutron-metadata-agent.service >/dev/null 2>&1 || :
-     /bin/systemctl try-restart neutron-lbaas-agent.service >/dev/null 2>&1 || :
- fi
- 
- %pretrans
- if rpm --quiet -q openstack-quantum; then
-     mkdir -p  %{_localstatedir}/lib/rpm-state/
- 
-     # Create a script for restoring init script enabling that we can also
-     # use as a flag to detect quantum -> grizzly upgrades in %posttrans
-     systemctl list-unit-files|grep '^quantum.*enabled\s*$'| \
-       sed -re 's/(\S+).*/systemctl enable \1/
-                s/quantum/neutron/g' > %{_localstatedir}/lib/rpm-state/UPGRADE_FROM_QUANTUM
- fi
- 
- %posttrans
- # Handle migration from quantum -> neutron
- if [ -e %{_localstatedir}/lib/rpm-state/UPGRADE_FROM_QUANTUM ];then
-     # Migrate existing config files
-     for i in `find /etc/quantum -name *.rpmsave`;do
-         new=${i//quantum/neutron}
-         new=${new/%.rpmsave/}
-         sed -e '/^sql_connection/ b
-                 /^admin_user/ b
-                 s/quantum/neutron/g
-                 s/Quantum/Neutron/g' $i > $new
+     /sbin/service neutron-server condrestart >/dev/null 2>&1 || :
 -    for agent in dhcp l3 metadata lbaas; do
 -      /sbin/service neutron-$agent-agent condrestart >/dev/null 2>&1 || :
++    for agent in dhcp l3 lbaas metadata; do
++      /sbin/service neutron-$agent-agent condrestart >/dev/null 2>&1 ||
++:
      done
- 
-     # Re-create plugin.ini if it existed.
-     if [ -h %{_sysconfdir}/quantum/plugin.ini ];then
-         plugin_ini=$(readlink %{_sysconfdir}/quantum/plugin.ini)
-         ln -s ${plugin_ini//quantum/neutron} %{_sysconfdir}/neutron/plugin.ini
-     fi
- 
-     # Stamp the existing db as grizzly to avoid neutron-server breaking db migration
-     neutron-db-manage --config-file %{_sysconfdir}/neutron/neutron.conf --config-file %{_sysconfdir}/neutron/plugin.ini stamp grizzly || :
- 
-     # Restore the enablement of the various neutron services
-     source %{_localstatedir}/lib/rpm-state/UPGRADE_FROM_QUANTUM
- 
-     rm -f %{_localstatedir}/lib/rpm-state/UPGRADE_FROM_QUANTUM
  fi
 -
 -%pretrans
 -if rpm --quiet -q openstack-quantum; then
 -    mkdir -p  %{_localstatedir}/lib/rpm-state/
 -
 -    # Create a script for restoring init script enabling that we can also
 -    # use as a flag to detect quantum -> grizzly upgrades in %posttrans
 -    chkconfig --type sysv --list|grep ^quantum| \
 -      sed -re 's/[0-6]:off//g
 -               s/([0-6]):on\s*/\1/g
 -               s/quantum/neutron/g
 -               s/^([a-z0-9-]+)\s+$/chkconfig \1 off/
 -               s/^([a-z0-9-]+)\s+([0-6]+)/chkconfig --levels \2 \1 on/' > %{_localstatedir}/lib/rpm-state/UPGRADE_FROM_QUANTUM
++%else
++%systemd_postun_with_restart neutron-openvswitch-agent.service
++%systemd_postun_with_restart neutron-ryu-agent.service
++%systemd_postun_with_restart neutron-nec-agent.service
++%systemd_postun_with_restart neutron-dhcp-agent.service
++%systemd_postun_with_restart neutron-l3-agent.service
++%systemd_postun_with_restart neutron-metadata-agent.service
++%systemd_postun_with_restart neutron-lbaas-agent.service
++%systemd_postun_with_restart neutron-mlnx-agent.service
++%systemd_postun_with_restart neutron-vpn-agent.service
++%systemd_postun_with_restart neutron-metering-agent.service
++%systemd_postun_with_restart neutron-server.service
++%endif
++
++
++%post linuxbridge
++%if 0%{?rhel} == 6
++if [ $1 -eq 1 ] ; then
++    # Initial installation
++    /sbin/chkconfig --add openstack-linuxbridge-agent
+ fi
++%else
++%systemd_post openstack-linuxbridge-agent.service
++%endif
  
 -%posttrans
 -# Handle migration from quantum -> neutron
 -if [ -e %{_localstatedir}/lib/rpm-state/UPGRADE_FROM_QUANTUM ];then
 -    # Migrate existing config files
 -    for i in `find /etc/quantum -name *.rpmsave`;do
 -        new=${i//quantum/neutron}
 -        new=${new/%.rpmsave/}
 -        sed -e '/^sql_connection/ b
 -                /^admin_user/ b
 -                s/quantum/neutron/g
 -                s/Quantum/Neutron/g' $i > $new
 -    done
 -
 -    # Re-create plugin.ini if it existed.
 -    if [ -h %{_sysconfdir}/quantum/plugin.ini ];then
 -        plugin_ini=$(readlink %{_sysconfdir}/quantum/plugin.ini)
 -        ln -s ${plugin_ini//quantum/neutron} %{_sysconfdir}/neutron/plugin.ini
 -    fi
  
- %preun -n openstack-neutron-linuxbridge
 -    # Stamp the existing db as grizzly to avoid neutron-server breaking db
 -    # migration after upgrade
 -    neutron-db-manage --config-file %{_sysconfdir}/neutron/neutron.conf \
 -        --config-file %{_sysconfdir}/neutron/plugin.ini stamp grizzly || :
++%preun linuxbridge
++%if 0%{?rhel} == 6
 +if [ $1 -eq 0 ] ; then
 +    # Package removal, not upgrade
-     /bin/systemctl --no-reload disable neutron-linuxbridge-agent.service > /dev/null 2>&1 || :
-     /bin/systemctl stop neutron-linuxbridge-agent.service > /dev/null 2>&1 || :
++    /sbin/service neutron-linuxbridge-agent stop >/dev/null 2>&1
++    /sbin/chkconfig --del neutron-linuxbridge-agent
 +fi
++%else
++%systemd_preun neutron-linuxbridge-agent.service
++%endif
  
 -    # Restore the enablement of the various neutron services
 -    source %{_localstatedir}/lib/rpm-state/UPGRADE_FROM_QUANTUM
  
- %postun -n openstack-neutron-linuxbridge
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 -    rm -f %{_localstatedir}/lib/rpm-state/UPGRADE_FROM_QUANTUM
++%postun linuxbridge
++%if 0%{?rhel} == 6
 +if [ $1 -ge 1 ] ; then
 +    # Package upgrade, not uninstall
-     /bin/systemctl try-restart neutron-linuxbridge-agent.service >/dev/null 2>&1 || :
++    /sbin/service neutron-linuxbridge-agent condrestart >/dev/null 2>&1
++|| :
  fi
++%else
++%systemd_postun_with_restart neutron-linuxbridge-agent.service
++%endif
  
  
- %preun -n openstack-neutron-mellanox
 -%post -n openstack-neutron-linuxbridge
++%post mellanox
++%if 0%{?rhel} == 6
+ if [ $1 -eq 1 ] ; then
+     # Initial installation
 -    /sbin/chkconfig --add neutron-linuxbridge-agent
++    /sbin/chkconfig --add openstack-mlnx-agent
+ fi
++%else
++%systemd_post openstack-mlnx-agent.service
++%endif
++
+ 
 -%preun -n openstack-neutron-linuxbridge
++%preun mellanox
++%if 0%{?rhel} == 6
  if [ $1 -eq 0 ] ; then
      # Package removal, not upgrade
-     /bin/systemctl --no-reload disable neutron-mlnx-agent.service > /dev/null 2>&1 || :
-     /bin/systemctl stop neutron-mlnx-agent.service > /dev/null 2>&1 || :
 -    /sbin/service neutron-linuxbridge-agent stop >/dev/null 2>&1
 -    /sbin/chkconfig --del neutron-linuxbridge-agent
++    /sbin/service neutron-mlnx-agent stop >/dev/null 2>&1
++    /sbin/chkconfig --del neutron-mlnx-agent
  fi
++%else
++%systemd_preun neutron-mlnx-agent.service
++%endif
  
 -%postun -n openstack-neutron-linuxbridge
 +
- %postun -n openstack-neutron-mellanox
++%postun mellanox
++%if 0%{?rhel} == 6
  if [ $1 -ge 1 ] ; then
      # Package upgrade, not uninstall
-     /bin/systemctl try-restart neutron-mlnx-agent.service >/dev/null 2>&1 || :
 -    /sbin/service neutron-linuxbridge-agent condrestart >/dev/null 2>&1 || :
++    /bin/systemctl try-restart neutron-mlnx-agent.service >/dev/null
++2>&1 || :
  fi
++%else
++%systemd_postun_with_restart neutron-mlnx-agent.service
++%endif
  
  
- %preun -n openstack-neutron-openvswitch
 -%post -n openstack-neutron-openvswitch
++%post openvswitch
++%if 0%{?rhel} == 6
+ if [ $1 -eq 1 ] ; then
+     # Initial installation
 -    /sbin/chkconfig --add neutron-openvswitch-agent
++    /sbin/chkconfig --add openstack-openvswitch-agent
+ fi
++%else
++%systemd_post neutron-ovs-cleanup.service
++%systemd_post openstack-openvswitch-agent.service
++%endif
++
+ 
 -%preun -n openstack-neutron-openvswitch
++%preun openvswitch
++%if 0%{?rhel} == 6
  if [ $1 -eq 0 ] ; then
      # Package removal, not upgrade
-     /bin/systemctl --no-reload disable neutron-openvswitch-agent.service > /dev/null 2>&1 || :
-     /bin/systemctl stop neutron-openvswitch-agent.service > /dev/null 2>&1 || :
+     /sbin/service neutron-openvswitch-agent stop >/dev/null 2>&1
+     /sbin/chkconfig --del neutron-openvswitch-agent
  fi
++%else
++%systemd_preun neutron-openvswitch-agent.service
++%systemd_preun neutron-ovs-cleanup.service
++%endif
  
- 
--%postun -n openstack-neutron-openvswitch
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
++%postun openvswitch
++%if 0%{?rhel} == 6
  if [ $1 -ge 1 ] ; then
      # Package upgrade, not uninstall
-     /bin/systemctl try-restart neutron-openvswitch-agent.service >/dev/null 2>&1 || :
 -    /sbin/service neutron-openvswitch-agent condrestart >/dev/null 2>&1 || :
++    /sbin/service neutron-ovs-cleanup condrestart >/dev/null 2>&1 || :
++    /sbin/service neutron-openvswitch-agent condrestart >/dev/null 2>&1
++|| :
+ fi
++%else
++%systemd_postun_with_restart neutron-openvswitch-agent.service
++%systemd_postun_with_restart neutron-ovs-cleanup.service
++%endif
+ 
+ 
 -%post -n openstack-neutron-ryu
++%post ryu
++%if 0%{?rhel} == 6
+ if [ $1 -eq 1 ] ; then
+     # Initial installation
 -    /sbin/chkconfig --add neutron-ryu-agent
++    /sbin/chkconfig --add openstack-ryu-agent
  fi
++%else
++%systemd_post openstack-ryu-agent.service
++%endif
 +
  
--%preun -n openstack-neutron-ryu
++%preun ryu
++%if 0%{?rhel} == 6
  if [ $1 -eq 0 ] ; then
      # Package removal, not upgrade
-     /bin/systemctl --no-reload disable neutron-ryu-agent.service > /dev/null 2>&1 || :
-     /bin/systemctl stop neutron-ryu-agent.service > /dev/null 2>&1 || :
+     /sbin/service neutron-ryu-agent stop >/dev/null 2>&1
+     /sbin/chkconfig --del neutron-ryu-agent
  fi
++%else
++%systemd_preun neutron-ryu-agent.service
++%endif
  
 -%postun -n openstack-neutron-ryu
 +
- %postun -n openstack-neutron-ryu
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
++%postun ryu
++%if 0%{?rhel} == 6
  if [ $1 -ge 1 ] ; then
      # Package upgrade, not uninstall
-     /bin/systemctl try-restart neutron-ryu-agent.service >/dev/null 2>&1 || :
+     /sbin/service neutron-ryu-agent condrestart >/dev/null 2>&1 || :
  fi
++%else
++%systemd_postun_with_restart neutron-ryu-agent.service
++%endif
  
  
- %preun -n openstack-neutron-nec
 -%post -n openstack-neutron-nec
++%post nec
++%if 0%{?rhel} == 6
+ if [ $1 -eq 1 ] ; then
+     # Initial installation
 -    /sbin/chkconfig --add neutron-nec-agent
++    /sbin/chkconfig --add openstack-nec-agent
+ fi
++%else
++%systemd_post openstack-nec-agent.service
++%endif
++
+ 
 -%preun -n openstack-neutron-nec
++%preun nec
++%if 0%{?rhel} == 6
  if [ $1 -eq 0 ] ; then
      # Package removal, not upgrade
-     /bin/systemctl --no-reload disable neutron-nec-agent.service > /dev/null 2>&1 || :
-     /bin/systemctl stop neutron-nec-agent.service > /dev/null 2>&1 || :
+     /sbin/service neutron-nec-agent stop >/dev/null 2>&1
+     /sbin/chkconfig --del neutron-nec-agent
  fi
++%else
++%systemd_preun neutron-nec-agent.service
++%endif
  
  
--%postun -n openstack-neutron-nec
--/bin/systemctl daemon-reload >/dev/null 2>&1 || :
++%postun nec
++%if 0%{?rhel} == 6
  if [ $1 -ge 1 ] ; then
      # Package upgrade, not uninstall
-     /bin/systemctl try-restart neutron-nec-agent.service >/dev/null 2>&1 || :
+     /sbin/service neutron-nec-agent condrestart >/dev/null 2>&1 || :
+ fi
++%else
++%systemd_postun_with_restart neutron-nec-agent.service
++%endif
+ 
+ 
 -%post -n openstack-neutron-mellanox
++%post metering-agent
++%if 0%{?rhel} == 6
+ if [ $1 -eq 1 ] ; then
+     # Initial installation
 -    /sbin/chkconfig --add neutron-mlnx-agent
++    /sbin/chkconfig --add openstack-metering-agent
  fi
++%else
++%systemd_post openstack-metering-agent.service
++%endif
 +
  
- %preun -n openstack-neutron-metering-agent
 -%preun -n openstack-neutron-mellanox
++%preun metering-agent
++%if 0%{?rhel} == 6
  if [ $1 -eq 0 ] ; then
      # Package removal, not upgrade
-     /bin/systemctl --no-reload disable neutron-metering-agent.service > /dev/null 2>&1 || :
-     /bin/systemctl stop neutron-metering-agent.service > /dev/null 2>&1 || :
 -    /sbin/service neutron-mlnx-agent stop >/dev/null 2>&1
 -    /sbin/chkconfig --del neutron-mlnx-agent
++    /sbin/service neutron-metering-agent stop >/dev/null 2>&1
++    /sbin/chkconfig --del neutron-metering-agent
  fi
++%else
++%systemd_preun neutron-metering-agent.service
++%endif
 +
  
- %postun -n openstack-neutron-metering-agent
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 -%postun -n openstack-neutron-mellanox
++%postun metering-agent
++%if 0%{?rhel} == 6
  if [ $1 -ge 1 ] ; then
      # Package upgrade, not uninstall
-     /bin/systemctl try-restart neutron-metering-agent.service >/dev/null 2>&1 || :
 -    /sbin/service neutron-mlnx-agent condrestart >/dev/null 2>&1 || :
++    /sbin/service neutron-metering-agent condrestart >/dev/null 2>&1 ||
++:
+ fi
++%else
++%systemd_postun_with_restart neutron-metering-agent.service
++%endif
+ 
+ 
 -%post -n openstack-neutron-vpn-agent
++%post vpn-agent
++%if 0%{?rhel} == 6
+ if [ $1 -eq 1 ] ; then
+     # Initial installation
 -    /sbin/chkconfig --add neutron-vpn-agent
++    /sbin/chkconfig --add openstack-vpn-agent
  fi
++%else
++%systemd_post openstack-vpn-agent.service
++%endif
 +
  
--%preun -n openstack-neutron-vpn-agent
++%preun vpn-agent
++%if 0%{?rhel} == 6
  if [ $1 -eq 0 ] ; then
      # Package removal, not upgrade
-     /bin/systemctl --no-reload disable neutron-vpn-agent.service > /dev/null 2>&1 || :
-     /bin/systemctl stop neutron-vpn-agent.service > /dev/null 2>&1 || :
+     /sbin/service neutron-vpn-agent stop >/dev/null 2>&1
+     /sbin/chkconfig --del neutron-vpn-agent
  fi
++%else
++%systemd_preun neutron-vpn-agent.service
++%endif
  
 -%postun -n openstack-neutron-vpn-agent
 +
- %postun -n openstack-neutron-vpn-agent
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
++%postun vpn-agent
++%if 0%{?rhel} == 6
  if [ $1 -ge 1 ] ; then
      # Package upgrade, not uninstall
-     /bin/systemctl try-restart neutron-vpn-agent.service >/dev/null 2>&1 || :
+     /sbin/service neutron-vpn-agent condrestart >/dev/null 2>&1 || :
  fi
++%else
++%systemd_postun_with_restart neutron-vpn-agent.service
++%endif
  
  
 -%post -n openstack-neutron-metering-agent
 -if [ $1 -eq 1 ] ; then
 -    # Initial installation
 -    /sbin/chkconfig --add neutron-metering-agent
 -fi
 -
 -%preun -n openstack-neutron-metering-agent
 -if [ $1 -eq 0 ] ; then
 -    # Package removal, not upgrade
 -    /sbin/service neutron-metering-agent stop >/dev/null 2>&1
 -    /sbin/chkconfig --del neutron-metering-agent
 -fi
 -
 -%postun -n openstack-neutron-metering-agent
 -if [ $1 -ge 1 ] ; then
 -    # Package upgrade, not uninstall
 -    /sbin/service neutron-metering-agent condrestart >/dev/null 2>&1 || :
 -fi
 -
  %files
  %doc LICENSE
  %doc README.rst
@@@ -720,11 -812,20 +923,28 @@@
  %{_bindir}/neutron-server-setup
  %{_bindir}/neutron-usage-audit
  
 -%{_bindir}/neutron-db-check
 -
++%if 0%{?rhel} == 6
+ %{_initrddir}/neutron-server
+ %{_initrddir}/neutron-dhcp-agent
+ %{_initrddir}/neutron-l3-agent
+ %{_initrddir}/neutron-metadata-agent
+ %{_initrddir}/neutron-ovs-cleanup
+ %{_initrddir}/neutron-lbaas-agent
+ %dir %{_datadir}/neutron
+ %{_datadir}/neutron/neutron-server.upstart
+ %{_datadir}/neutron/neutron-dhcp-agent.upstart
+ %{_datadir}/neutron/neutron-metadata-agent.upstart
+ %{_datadir}/neutron/neutron-l3-agent.upstart
+ %{_datadir}/neutron/neutron-lbaas-agent.upstart
++%else
 +%{_unitdir}/neutron-dhcp-agent.service
 +%{_unitdir}/neutron-l3-agent.service
 +%{_unitdir}/neutron-lbaas-agent.service
 +%{_unitdir}/neutron-metadata-agent.service
 +%{_unitdir}/neutron-server.service
++%endif
++
++%{_bindir}/neutron-db-check
  %dir %{_sysconfdir}/neutron
  %{_sysconfdir}/neutron/release
  %attr(-, root, neutron) %{_datadir}/neutron/neutron-dist.conf
@@@ -794,7 -896,8 +1015,12 @@@
  %doc neutron/plugins/linuxbridge/README
  %{_bindir}/neutron-linuxbridge-agent
  %{_bindir}/quantum-linuxbridge-agent
++%if 0%{?rhel} == 6
+ %{_initrddir}/neutron-linuxbridge-agent
+ %{_datadir}/neutron/neutron-linuxbridge-agent.upstart
++%else
 +%{_unitdir}/neutron-linuxbridge-agent.service
++%endif
  %{_datarootdir}/neutron/rootwrap/linuxbridge-plugin.filters
  %dir %{_sysconfdir}/neutron/plugins/linuxbridge
  %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/linuxbridge/*.ini
@@@ -819,7 -922,8 +1045,12 @@@
  %doc neutron/plugins/mlnx/README
  %{_bindir}/neutron-mlnx-agent
  %{_bindir}/quantum-mlnx-agent
++%if 0%{?rhel} == 6
+ %{_initrddir}/neutron-mlnx-agent
+ %{_datadir}/neutron/neutron-mlnx-agent.upstart
++%else
 +%{_unitdir}/neutron-mlnx-agent.service
++%endif
  %dir %{_sysconfdir}/neutron/plugins/mlnx
  %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/mlnx/*.ini
  
@@@ -840,8 -944,10 +1071,15 @@@
  %{_bindir}/quantum-openvswitch-agent
  %{_bindir}/neutron-ovs-cleanup
  %{_bindir}/quantum-ovs-cleanup
++%if 0%{?rhel} == 6
+ %{_initrddir}/neutron-openvswitch-agent
+ %{_datadir}/neutron/neutron-openvswitch-agent.upstart
+ %{_initrddir}/neutron-ovs-cleanup
+ %{_datadir}/neutron/neutron-ovs-cleanup.upstart
++%else
 +%{_unitdir}/neutron-openvswitch-agent.service
 +%{_unitdir}/neutron-ovs-cleanup.service
++%endif
  %{_datarootdir}/neutron/rootwrap/openvswitch-plugin.filters
  %dir %{_sysconfdir}/neutron/plugins/openvswitch
  %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/openvswitch/*.ini
@@@ -859,7 -965,8 +1097,12 @@@
  %doc neutron/plugins/ryu/README
  %{_bindir}/neutron-ryu-agent
  %{_bindir}/quantum-ryu-agent
++%if 0%{?rhel} == 6
+ %{_initrddir}/neutron-ryu-agent
+ %{_datadir}/neutron/neutron-ryu-agent.upstart
++%else
 +%{_unitdir}/neutron-ryu-agent.service
++%endif
  %{_datarootdir}/neutron/rootwrap/ryu-plugin.filters
  %dir %{_sysconfdir}/neutron/plugins/ryu
  %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/ryu/*.ini
@@@ -870,7 -977,8 +1113,12 @@@
  %doc neutron/plugins/nec/README
  %{_bindir}/neutron-nec-agent
  %{_bindir}/quantum-nec-agent
++%if 0%{?rhel} == 6
+ %{_initrddir}/neutron-nec-agent
+ %{_datadir}/neutron/neutron-nec-agent.upstart
++%else
 +%{_unitdir}/neutron-nec-agent.service
++%endif
  %{_datarootdir}/neutron/rootwrap/nec-plugin.filters
  %dir %{_sysconfdir}/neutron/plugins/nec
  %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/nec/*.ini
@@@ -886,26 -994,25 +1134,41 @@@
  %files -n openstack-neutron-metering-agent
  %doc LICENSE
  %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/metering_agent.ini
++%if 0%{?rhel} == 6
+ %{_initrddir}/neutron-metering-agent
+ %{_datadir}/neutron/neutron-metering-agent.upstart
++%else
 +%{_unitdir}/neutron-metering-agent.service
++%endif
  %{_bindir}/neutron-metering-agent
  
  
  %files -n openstack-neutron-vpn-agent
  %doc LICENSE
  %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/vpn_agent.ini
++%if 0%{?rhel} == 6
+ %{_initrddir}/neutron-vpn-agent
+ %{_datadir}/neutron/neutron-vpn-agent.upstart
++%else
 +%{_unitdir}/neutron-vpn-agent.service
++%endif
  %{_bindir}/neutron-vpn-agent
  %{_datarootdir}/neutron/rootwrap/vpnaas.filters
  
  
  %changelog
 -* Wed Jul 23 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2013.2.3-11
 -- no quota for allowed address pair, rhbz#1121941
++* Mon Sep 22 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2013.2.4-2
++- Merged in el6-havana branch, resolving conflicts between platforms
++  with if-else conditionals. This is needed because el6-havana was
++  (erroneously) locked when locking el6 branch.
++
 +* Mon Sep 22 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2013.2.4-1
 +- Update to upstream 2013.2.4
  
 -* Wed Jul 16 2014 Miguel Ángel Ajo <majopela at redhat.com> 2013.2.3-10
 +* Wed Jul 23 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2013.2.3-13
 +- no quota for allowed address pair, rhbz#1122428
 +
 +* Wed Jul 16 2014 Miguel Ángel Ajo <majopela at redhat.com> 2013.2.3-12
  - Moved all plugin sources to python-neutron to avoid breaking
    hidden upstream dependencies from agents to plugins, etc.
    fixes rhbz#1120146

More information about the scm-commits mailing list