Code Review
/
apex.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Migrates master to use direct upstream
[apex.git]
/
build
/
rpm_specs
/
networking-vpp.spec
diff --git
a/build/rpm_specs/networking-vpp.spec
b/build/rpm_specs/networking-vpp.spec
index
97668c8
..
9fb66ad
100644
(file)
--- a/
build/rpm_specs/networking-vpp.spec
+++ b/
build/rpm_specs/networking-vpp.spec
@@
-2,7
+2,7
@@
Summary: OpenStack Networking for VPP
Name: python-networking-vpp
Summary: OpenStack Networking for VPP
Name: python-networking-vpp
-Version:
0.0.1
+Version:
18.04
Release: %{release}%{?git}%{?dist}
License: Apache 2.0
Release: %{release}%{?git}%{?dist}
License: Apache 2.0
@@
-12,7
+12,7
@@
Url: https://github.com/openstack/networking-vpp/
BuildArch: noarch
AutoReq: no
BuildArch: noarch
AutoReq: no
-Requires: vpp
+Requires: vpp
python-jwt
Vendor: OpenStack <openstack-dev@lists.openstack.org>
Packager: Feng Pan <fpan@redhat.com>
Vendor: OpenStack <openstack-dev@lists.openstack.org>
Packager: Feng Pan <fpan@redhat.com>
@@
-27,7
+27,7
@@
Description=Networking VPP ML2 Agent
[Service]
ExecStartPre=/usr/bin/systemctl is-active vpp
[Service]
ExecStartPre=/usr/bin/systemctl is-active vpp
-ExecStart=/usr/bin/vpp-agent --config-file /etc/neutron/plugins/ml2/vpp_agent.ini
+ExecStart=/usr/bin/vpp-agent --config-file /etc/neutron/plugins/ml2/vpp_agent.ini
--log-file /var/log/neutron/vpp-agent.log
Type=simple
Restart=on-failure
RestartSec=5s
Type=simple
Restart=on-failure
RestartSec=5s
@@
-37,14
+37,22
@@
WantedBy=multi-user.target
EOF
EOF
+%preun
+%systemd_preun neutron-vpp-agent.service
+
+%postun
+%systemd_postun
+rm -rf %{python2_sitelib}/networking_vpp*
+
%install
python setup.py install -O1 --root=%{buildroot} --record=INSTALLED_FILES
%install
python setup.py install -O1 --root=%{buildroot} --record=INSTALLED_FILES
-mkdir -p %{buildroot}
/usr/lib
/systemd/system
-install %{_builddir}/neutron-vpp-agent.service %{buildroot}
/usr/lib/systemd/system
+mkdir -p %{buildroot}
%{_libdir}
/systemd/system
+install %{_builddir}/neutron-vpp-agent.service %{buildroot}
%{_unitdir}
%clean
rm -rf %{buildroot}
%files -f INSTALLED_FILES
%defattr(-,root,root)
%clean
rm -rf %{buildroot}
%files -f INSTALLED_FILES
%defattr(-,root,root)
-%attr(644,root,root) /usr/lib/systemd/system/neutron-vpp-agent.service
+%attr(644,root,root) %{_unitdir}/neutron-vpp-agent.service
+