[openstack-neutron/el6-icehouse] Removed obsolete setup scripts
Ihar Hrachyshka
ihrachyshka at fedoraproject.org
Mon Apr 28 16:20:27 UTC 2014
commit 4b6a05fa01050424f04fe57da5d92c66335056df
Author: Ihar Hrachyshka <ihrachys at redhat.com>
Date: Wed Apr 23 11:31:41 2014 +0200
Removed obsolete setup scripts
Conflicts:
openstack-neutron.spec
neutron-dhcp-setup | 135 -----------------
neutron-l3-setup | 137 ------------------
neutron-node-setup | 173 ----------------------
neutron-server-setup | 376 ------------------------------------------------
openstack-neutron.spec | 19 +--
5 files changed, 4 insertions(+), 836 deletions(-)
---
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index 143ccac..55721c3 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -2,7 +2,7 @@
Name: openstack-neutron
Version: 2014.1
-Release: 12%{?dist}
+Release: 13%{?dist}
Provides: openstack-quantum = %{version}-%{release}
Obsoletes: openstack-quantum < 2013.2-0.3.b3
@@ -15,10 +15,6 @@ URL: http://launchpad.net/neutron/
Source0: http://launchpad.net/neutron/%{release_name}/%{version}/+download/neutron-%{version}.tar.gz
Source1: neutron.logrotate
Source2: neutron-sudoers
-Source4: neutron-server-setup
-Source5: neutron-node-setup
-Source6: neutron-dhcp-setup
-Source7: neutron-l3-setup
Source10: neutron-server.init
Source20: neutron-server.upstart
@@ -548,12 +544,6 @@ install -d -m 755 %{buildroot}%{_sharedstatedir}/neutron
install -d -m 755 %{buildroot}%{_localstatedir}/log/neutron
install -d -m 755 %{buildroot}%{_localstatedir}/run/neutron
-# Install setup helper scripts
-install -p -D -m 755 %{SOURCE4} %{buildroot}%{_bindir}/neutron-server-setup
-install -p -D -m 755 %{SOURCE5} %{buildroot}%{_bindir}/neutron-node-setup
-install -p -D -m 755 %{SOURCE6} %{buildroot}%{_bindir}/neutron-dhcp-setup
-install -p -D -m 755 %{SOURCE7} %{buildroot}%{_bindir}/neutron-l3-setup
-
# Install upstart jobs examples
install -p -m 644 %{SOURCE20} %{buildroot}%{_datadir}/neutron/
install -p -m 644 %{SOURCE21} %{buildroot}%{_datadir}/neutron/
@@ -820,18 +810,14 @@ fi
%{_bindir}/neutron-db-manage
%{_bindir}/neutron-debug
%{_bindir}/neutron-dhcp-agent
-%{_bindir}/neutron-dhcp-setup
%{_bindir}/neutron-l3-agent
-%{_bindir}/neutron-l3-setup
%{_bindir}/neutron-lbaas-agent
%{_bindir}/neutron-metadata-agent
%{_bindir}/neutron-netns-cleanup
-%{_bindir}/neutron-node-setup
%{_bindir}/neutron-ns-metadata-proxy
%{_bindir}/neutron-rootwrap
%{_bindir}/neutron-rootwrap-xen-dom0
%{_bindir}/neutron-server
-%{_bindir}/neutron-server-setup
%{_bindir}/neutron-usage-audit
%{_initrddir}/neutron-server
@@ -1090,6 +1076,9 @@ fi
%changelog
+* Wed Apr 23 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2014.1-13
+- Removed obsolete setup scripts
+
* Mon Apr 28 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2014.1-12
- Removed signing_dir from neutron.conf
More information about the scm-commits
mailing list