vpn and lbaas agents are separate projects now
Change-Id: I762712ef912e88baa28af639ba2b84f6258e22d2
debian/cron.d/neutron-l3-agent-netns-cleanup etc/cron.d
debian/neutron_sudoers etc/sudoers.d
etc/api-paste.ini etc/neutron
debian/cron.d/neutron-l3-agent-netns-cleanup etc/cron.d
debian/neutron_sudoers etc/sudoers.d
etc/api-paste.ini etc/neutron
-etc/fwaas_driver.ini etc/neutron
etc/l3_agent.ini etc/neutron
etc/neutron.conf etc/neutron
etc/neutron/rootwrap.d/debug.filters etc/neutron/rootwrap.d
etc/neutron/rootwrap.d/iptables-firewall.filters etc/neutron/rootwrap.d
etc/neutron/rootwrap.d/l3.filters etc/neutron/rootwrap.d
etc/l3_agent.ini etc/neutron
etc/neutron.conf etc/neutron
etc/neutron/rootwrap.d/debug.filters etc/neutron/rootwrap.d
etc/neutron/rootwrap.d/iptables-firewall.filters etc/neutron/rootwrap.d
etc/neutron/rootwrap.d/l3.filters etc/neutron/rootwrap.d
-etc/neutron/rootwrap.d/vpnaas.filters etc/neutron/rootwrap.d
etc/neutron/rootwrap.d/ipset-firewall.filters etc/neutron/rootwrap.d
etc/policy.json etc/neutron
etc/rootwrap.conf etc/neutron
etc/neutron/rootwrap.d/ipset-firewall.filters etc/neutron/rootwrap.d
etc/policy.json etc/neutron
etc/rootwrap.conf etc/neutron
-etc/vpn_agent.ini etc/neutron
usr/bin/neutron-db-manage usr/bin
usr/bin/neutron-debug usr/bin
usr/bin/neutron-netns-cleanup usr/bin
usr/bin/neutron-db-manage usr/bin
usr/bin/neutron-debug usr/bin
usr/bin/neutron-netns-cleanup usr/bin
exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-l3-agent -- \
--config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/l3_agent.ini \
exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-l3-agent -- \
--config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/l3_agent.ini \
- --config-file=/etc/neutron/fwaas_driver.ini --log-file=/var/log/neutron/l3-agent.log
+ --log-file=/var/log/neutron/l3-agent.log
debian/cron.d/neutron-lbaas-agent-netns-cleanup etc/cron.d
debian/cron.d/neutron-lbaas-agent-netns-cleanup etc/cron.d
-etc/lbaas_agent.ini etc/neutron
-etc/neutron/rootwrap.d/lbaas-haproxy.filters etc/neutron/rootwrap.d
-usr/bin/neutron-lbaas-agent usr/bin
-usr/bin/neutron-vpn-agent usr/bin
exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-vpn-agent -- \
--config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/vpn_agent.ini \
exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-vpn-agent -- \
--config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/vpn_agent.ini \
- --config-file=/etc/neutron/l3_agent.ini --config-file=/etc/neutron/fwaas_driver.ini \
- --log-file=/var/log/neutron/vpn_agent.log
+ --config-file=/etc/neutron/l3_agent.ini --log-file=/var/log/neutron/vpn_agent.log
"/usr/share/$proj/$proj-dist.conf" \
"/etc/$proj/$proj.conf" \
"/etc/$proj/l3_agent.ini" \
"/usr/share/$proj/$proj-dist.conf" \
"/etc/$proj/$proj.conf" \
"/etc/$proj/l3_agent.ini" \
- "/etc/$proj/fwaas_driver.ini" \
)
pidfile="/var/run/$proj/$prog.pid"
)
pidfile="/var/run/$proj/$prog.pid"
-exec su -s /bin/sh -c "exec /usr/bin/neutron-l3-agent --log-file /var/log/neutron/l3-agent.log --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini" --config-file /etc/neutron/fwaas_driver.ini neutron
+exec su -s /bin/sh -c "exec /usr/bin/neutron-l3-agent --log-file /var/log/neutron/l3-agent.log --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini" neutron
"/etc/$proj/$proj.conf" \
"/etc/$proj/vpn_agent.ini" \
"/etc/$proj/l3_agent.ini" \
"/etc/$proj/$proj.conf" \
"/etc/$proj/vpn_agent.ini" \
"/etc/$proj/l3_agent.ini" \
- "/etc/$proj/fwaas_driver.ini" \
)
pidfile="/var/run/$proj/$prog.pid"
)
pidfile="/var/run/$proj/$prog.pid"
-exec su -s /bin/sh -c "exec /usr/bin/neutron-vpn-agent --log-file /var/log/neutron/vpn-agent.log --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/vpn_agent.ini --config-file /etc/neutron/l3_agent.ini --config-file /etc/neutron/fwaas_driver.ini" neutron
+exec su -s /bin/sh -c "exec /usr/bin/neutron-vpn-agent --log-file /var/log/neutron/vpn-agent.log --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/vpn_agent.ini --config-file /etc/neutron/l3_agent.ini" neutron
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 %{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-mlnx-agent
install -p -D -m 755 %{SOURCE31} %{buildroot}%{_initrddir}/neutron-vpn-agent
install -p -D -m 755 %{SOURCE32} %{buildroot}%{_initrddir}/neutron-metering-agent
%{_bindir}/neutron-debug
%{_bindir}/neutron-dhcp-agent
%{_bindir}/neutron-l3-agent
%{_bindir}/neutron-debug
%{_bindir}/neutron-dhcp-agent
%{_bindir}/neutron-l3-agent
-%{_bindir}/neutron-lbaas-agent
%{_bindir}/neutron-metadata-agent
%{_bindir}/neutron-netns-cleanup
%{_bindir}/neutron-ns-metadata-proxy
%{_bindir}/neutron-metadata-agent
%{_bindir}/neutron-netns-cleanup
%{_bindir}/neutron-ns-metadata-proxy
%{_initrddir}/neutron-l3-agent
%{_initrddir}/neutron-metadata-agent
%{_initrddir}/neutron-ovs-cleanup
%{_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
%dir %{_datadir}/neutron
%{_datadir}/neutron/neutron-server.upstart
%{_datadir}/neutron/neutron-dhcp-agent.upstart
%attr(-, root, neutron) %{_datadir}/neutron/neutron-dist.conf
%attr(-, root, neutron) %{_datadir}/neutron/api-paste.ini
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/dhcp_agent.ini
%attr(-, root, neutron) %{_datadir}/neutron/neutron-dist.conf
%attr(-, root, neutron) %{_datadir}/neutron/api-paste.ini
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/dhcp_agent.ini
-%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/fwaas_driver.ini
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/l3_agent.ini
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/metadata_agent.ini
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/l3_agent.ini
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/metadata_agent.ini
-%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/lbaas_agent.ini
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/policy.json
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/neutron.conf
%config(noreplace) %{_sysconfdir}/neutron/rootwrap.conf
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/policy.json
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/neutron.conf
%config(noreplace) %{_sysconfdir}/neutron/rootwrap.conf
%{_datarootdir}/neutron/rootwrap/ipset-firewall.filters
%{_datarootdir}/neutron/rootwrap/iptables-firewall.filters
%{_datarootdir}/neutron/rootwrap/l3.filters
%{_datarootdir}/neutron/rootwrap/ipset-firewall.filters
%{_datarootdir}/neutron/rootwrap/iptables-firewall.filters
%{_datarootdir}/neutron/rootwrap/l3.filters
-%{_datarootdir}/neutron/rootwrap/lbaas-haproxy.filters
%exclude %{python_sitelib}/neutron/plugins/vmware
%{python_sitelib}/neutron-%%{version}*.egg-info
%exclude %{python_sitelib}/neutron/plugins/vmware
%{python_sitelib}/neutron-%%{version}*.egg-info
%files bigswitch
%doc LICENSE
%{_bindir}/neutron-restproxy-agent
%files bigswitch
%doc LICENSE
%{_bindir}/neutron-restproxy-agent
%files vpn-agent
%doc LICENSE
%files vpn-agent
%doc LICENSE
-%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/vpn_agent.ini
%{_initrddir}/neutron-vpn-agent
%{_datadir}/neutron/neutron-vpn-agent.upstart
%{_initrddir}/neutron-vpn-agent
%{_datadir}/neutron/neutron-vpn-agent.upstart
-%{_bindir}/neutron-vpn-agent
-%{_datarootdir}/neutron/rootwrap/vpnaas.filters