From e8b1af028a3d8fbc7c008c4f8704315ef83ed021 Mon Sep 17 00:00:00 2001 From: Sergey Kolekonov Date: Mon, 12 Jan 2015 15:18:48 +0300 Subject: [PATCH] Fix packages for vpn and lbaas agents vpn and lbaas agents are separate projects now Change-Id: I762712ef912e88baa28af639ba2b84f6258e22d2 --- debian/neutron-common.install | 3 --- debian/neutron-l3-agent.upstart | 2 +- debian/neutron-lbaas-agent.install | 3 --- debian/neutron-vpn-agent.install | 1 - debian/neutron-vpn-agent.upstart | 3 +-- rpm/SOURCES/neutron-l3-agent.init | 1 - rpm/SOURCES/neutron-l3-agent.upstart | 2 +- rpm/SOURCES/neutron-vpn-agent.init | 1 - rpm/SOURCES/neutron-vpn-agent.upstart | 2 +- rpm/SPECS/openstack-neutron.spec | 10 ---------- 10 files changed, 4 insertions(+), 24 deletions(-) diff --git a/debian/neutron-common.install b/debian/neutron-common.install index dc136d20b..83f327bbc 100644 --- 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 0b69d1385..4a358a5ca 100644 --- 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 45251fb35..23968000b 100644 --- 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 8217b7501..e69de29bb 100644 --- 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 bf983dc13..4697efef5 100644 --- 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 d07f5a4ee..0e241f84c 100644 --- 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 81b4d4715..35e1d3261 100644 --- 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 feb4af521..6140ece10 100644 --- 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 d31274d7f..94830d7db 100644 --- 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 5983770d3..dcc14049b 100644 --- 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 -- 2.32.3