Fix packages for vpn and lbaas agents

vpn and lbaas agents are separate projects now

Change-Id: I762712ef912e88baa28af639ba2b84f6258e22d2

diff --git a/debian/neutron-common.install b/debian/neutron-common.install
index dc136d20b9fb50e654d3794a09cb3f02e82ee656..83f327bbce24668132a2495ffc2eb3232aebb44e 100644 (file)
--- a/debian/neutron-common.install
+++ b/debian/neutron-common.install
@@ -1,17 +1,14 @@
 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/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/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

diff --git a/debian/neutron-l3-agent.upstart b/debian/neutron-l3-agent.upstart
index 0b69d138543fb4f16315c48901379084464784fd..4a358a5cabcb15bdea21242bb110a5149b3533bf 100644 (file)
--- a/debian/neutron-l3-agent.upstart
+++ b/debian/neutron-l3-agent.upstart
@@ -21,4 +21,4 @@ end script
 
 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

diff --git a/debian/neutron-lbaas-agent.install b/debian/neutron-lbaas-agent.install
index 45251fb35c09e7ccd52d89456326cd38ff0bd84d..23968000b91ab1ef61c8e4e09352220362704f7e 100644 (file)
--- a/debian/neutron-lbaas-agent.install
+++ b/debian/neutron-lbaas-agent.install
@@ -1,4 +1 @@
 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

diff --git a/debian/neutron-vpn-agent.install b/debian/neutron-vpn-agent.install
index 8217b7501d2a132f22c3f6f6594baadb2e522074..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/debian/neutron-vpn-agent.install
+++ b/debian/neutron-vpn-agent.install
@@ -1 +0,0 @@
-usr/bin/neutron-vpn-agent usr/bin

diff --git a/debian/neutron-vpn-agent.upstart b/debian/neutron-vpn-agent.upstart
index bf983dc132a64d1e97f66c518608f4ffbb079b6c..4697efef5a13309fafc32c12c931c60d85a9d8c7 100644 (file)
--- a/debian/neutron-vpn-agent.upstart
+++ b/debian/neutron-vpn-agent.upstart
@@ -21,5 +21,4 @@ end script
 
 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

diff --git a/rpm/SOURCES/neutron-l3-agent.init b/rpm/SOURCES/neutron-l3-agent.init
index d07f5a4ee086fc923391f0dc799ad3c9ab3d6c53..0e241f84cf5db82c428eee69c0cfd1e64ecc544f 100644 (file)
--- a/rpm/SOURCES/neutron-l3-agent.init
+++ b/rpm/SOURCES/neutron-l3-agent.init
@@ -16,7 +16,6 @@ configs=(
     "/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"
 

diff --git a/rpm/SOURCES/neutron-l3-agent.upstart b/rpm/SOURCES/neutron-l3-agent.upstart
index 81b4d4715fbeeddc39d78a0f6d3ba66923a9338b..35e1d3261f05049fa0ca60aa913ed784b2434097 100644 (file)
--- a/rpm/SOURCES/neutron-l3-agent.upstart
+++ b/rpm/SOURCES/neutron-l3-agent.upstart
@@ -5,4 +5,4 @@ stop on runlevel [S016]
 
 respawn
 
-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

diff --git a/rpm/SOURCES/neutron-vpn-agent.init b/rpm/SOURCES/neutron-vpn-agent.init
index feb4af521f19656034a418885a96afd0736005b5..6140ece109d5b12d8c32999a082bcfd4f4ac31d5 100644 (file)
--- a/rpm/SOURCES/neutron-vpn-agent.init
+++ b/rpm/SOURCES/neutron-vpn-agent.init
@@ -17,7 +17,6 @@ configs=(
     "/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"
 

diff --git a/rpm/SOURCES/neutron-vpn-agent.upstart b/rpm/SOURCES/neutron-vpn-agent.upstart
index d31274d7fe169b23f5fe39f7a25b3bbf594618da..94830d7db239c49b99587e39eda79d7bc9739f78 100644 (file)
--- a/rpm/SOURCES/neutron-vpn-agent.upstart
+++ b/rpm/SOURCES/neutron-vpn-agent.upstart
@@ -5,4 +5,4 @@ stop on runlevel [S016]
 
 respawn
 
-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

diff --git a/rpm/SPECS/openstack-neutron.spec b/rpm/SPECS/openstack-neutron.spec
index 5983770d3eedbf7f931f996df7afe1d7eea259fb..dcc14049b6bfe3a5dcf74e74049a938b8f847457 100644 (file)
--- a/rpm/SPECS/openstack-neutron.spec
+++ b/rpm/SPECS/openstack-neutron.spec
@@ -537,7 +537,6 @@ 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
@@ -783,7 +782,6 @@ fi
 %{_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
@@ -799,7 +797,6 @@ fi
 %{_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
@@ -811,10 +808,8 @@ fi
 %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/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
@@ -830,7 +825,6 @@ fi
 %{_datarootdir}/neutron/rootwrap/ipset-firewall.filters
 %{_datarootdir}/neutron/rootwrap/iptables-firewall.filters
 %{_datarootdir}/neutron/rootwrap/l3.filters
-%{_datarootdir}/neutron/rootwrap/lbaas-haproxy.filters
 
 
 %files -n python-neutron
@@ -856,7 +850,6 @@ fi
 %exclude %{python_sitelib}/neutron/plugins/vmware
 %{python_sitelib}/neutron-%%{version}*.egg-info
 
-
 %files bigswitch
 %doc LICENSE
 %{_bindir}/neutron-restproxy-agent
@@ -1034,11 +1027,8 @@ fi
 
 %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
-%{_bindir}/neutron-vpn-agent
-%{_datarootdir}/neutron/rootwrap/vpnaas.filters
 
 
 %changelog