Add files for CPNR Plugin
The CPNR plugin was turned into a service by
https://review.openstack.org/307609 . Managing those service files,
adding the cpnr user (required by service).
Change-Id: I5363a38cb1c4970a73f62632d6002dc02f1b9fd9
diff --git a/python-networking-cisco.spec b/python-networking-cisco.spec
index caa5f90..2da5e64 100644
--- a/python-networking-cisco.spec
+++ b/python-networking-cisco.spec
@@ -73,11 +73,18 @@
install -p -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/neutron-cisco-cfg-agent.service
install -p -D -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/neutron-cisco-apic-host-agent.service
install -p -D -m 644 %{SOURCE3} %{buildroot}%{_unitdir}/neutron-cisco-apic-service-agent.service
-# TODO: add service files for cpnr-dhcp-relay and cpnr-dns-relay
+mv %{buildroot}/usr/etc/systemd/system/*.service %{buildroot}%{_unitdir}
mv %{buildroot}/usr/etc/saf/init/*.service %{buildroot}%{_unitdir}
# Remove upstart files, they are not needed
rm %{buildroot}/usr/etc/saf/init/*.conf
+rm %{buildroot}/usr/etc/init/*.conf
+
+# Move cpnr-rootwrap config files to its proper location
+mkdir %{buildroot}%{_sysconfdir}/cpnr
+mv %{buildroot}/usr/etc/cpnr/rootwrap.conf %{buildroot}%{_sysconfdir}/cpnr
+mkdir -p %{buildroot}%{_datarootdir}/cpnr/rootwrap/
+mv %{buildroot}/usr/usr/share/cpnr/rootwrap/cpnr.filters %{buildroot}%{_datarootdir}/cpnr/rootwrap/
mkdir -p %{buildroot}/%{_sysconfdir}/neutron/conf.d/neutron-cisco-cfg-agent
@@ -89,19 +96,31 @@
%{python2_sitelib}/%{srcname}-%{version}-py%{python2_version}.egg-info
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/*.ini
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/saf/*.ini
+%config(noreplace) %attr(0640, root, cpnr) %{_sysconfdir}/cpnr/*.conf
%{_bindir}/neutron-cisco-cfg-agent
%{_bindir}/neutron-cisco-apic-host-agent
%{_bindir}/neutron-cisco-apic-service-agent
%{_bindir}/fabric-enabler-agent
%{_bindir}/fabric-enabler-cli
%{_bindir}/fabric-enabler-server
-%{_bindir}/cpnr-dhcp-relay
-%{_bindir}/cpnr-dns-relay
+%{_bindir}/cpnr-dhcp-relay-agent
+%{_bindir}/cpnr-dns-relay-agent
+%{_bindir}/cpnr-rootwrap
%{_unitdir}/neutron-cisco-cfg-agent.service
%{_unitdir}/neutron-cisco-apic-host-agent.service
%{_unitdir}/neutron-cisco-apic-service-agent.service
%{_unitdir}/fabric-enabler-agent.service
%{_unitdir}/fabric-enabler-server.service
+%{_unitdir}/cpnr-dhcp-relay.service
+%{_unitdir}/cpnr-dns-relay.service
+%{_datarootdir}/cpnr/
+
+%pre
+getent group cpnr >/dev/null || groupadd -r cpnr
+getent passwd cpnr >/dev/null || \
+ useradd -r -g cpnr -d %{_datarootdir}/cpnr -s /sbin/nologin \
+ -c "OpenStack CPNR user for Cisco Networking" cpnr
+exit 0
%post
%systemd_post neutron-cisco-cfg-agent.service
@@ -109,6 +128,8 @@
%systemd_post neutron-cisco-apic-service-agent.service
%systemd_post fabric-enabler-agent.service
%systemd_post fabric-enabler-server.service
+%systemd_post cpnr-dns-relay.service
+%systemd_post cpnr-dhdp-relay.service
%preun
%systemd_preun neutron-cisco-cfg-agent.service
@@ -116,6 +137,8 @@
%systemd_preun neutron-cisco-apic-service-agent.service
%systemd_preun fabric-enabler-agent.service
%systemd_preun fabric-enabler-server.service
+%systemd_preun cpnr-dns-relay.service
+%systemd_preun cpnr-dhdp-relay.service
%postun
%systemd_postun_with_restart neutron-cisco-cfg-agent.service
@@ -123,5 +146,7 @@
%systemd_postun_with_restart neutron-cisco-apic-service-agent.service
%systemd_postun_with_restart fabric-enabler-agent.service
%systemd_postun_with_restart fabric-enabler-server.service
+%systemd_postun_with_restart cpnr-dns-relay.service
+%systemd_postun_with_restart cpnr-dhdp-relay.service
%changelog