Hello community,
here is the log from the commit of package openstack-neutron for
openSUSE:Factory checked in at 2013-07-10 17:29:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openstack-neutron (Old)
and /work/SRC/openSUSE:Factory/.openstack-neutron.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-neutron"
Changes:
--------
New Changes file:
--- /dev/null 2013-07-02 09:26:14.908030755 +0200
+++
/work/SRC/openSUSE:Factory/.openstack-neutron.new/openstack-neutron-doc.changes
2013-07-10 17:29:58.000000000 +0200
@@ -0,0 +1,15 @@
+-------------------------------------------------------------------
+Mon Mar 18 10:59:30 UTC 2013 - [email protected]
+
+- Drop +git.$TIMESTAMP.$COMMITHASH version suffix
+
+-------------------------------------------------------------------
+Fri Feb 22 11:24:49 UTC 2013 - [email protected]
+
+- BuildRequire openstack-suse-macros instead of openstack-macros
+
+-------------------------------------------------------------------
+Mon Jan 14 13:41:52 UTC 2013 - [email protected]
+
+- Initial version
+
New Changes file:
--- /dev/null 2013-07-02 09:26:14.908030755 +0200
+++ /work/SRC/openSUSE:Factory/.openstack-neutron.new/openstack-neutron.changes
2013-07-10 17:29:58.000000000 +0200
@@ -0,0 +1,2914 @@
+-------------------------------------------------------------------
+Tue Jul 9 10:25:00 UTC 2013 - [email protected]
+
+- Update to version 2013.2.a905.g5434abb:
+ + Divide dhcp and l3 agent scheduling into separate extensions
+ + Imported Translations from Transifex
+
+-------------------------------------------------------------------
+Tue Jul 9 00:12:19 UTC 2013 - [email protected]
+
+- Update to version 2013.2.a901.g0aa5bec:
+ + fix some missing change from quantum to neutron
+ + add notification_driver to compatibilty clean-up
+
+-------------------------------------------------------------------
+Mon Jul 8 11:01:37 UTC 2013 - [email protected]
+
+- Update to version 2013.2.a898.g62fb7ad:
+ + Complete rename to Neutron
+ + Imported Translations from Transifex
+ + clean-up missing rename
+
+-------------------------------------------------------------------
+Mon Jul 8 09:32:09 UTC 2013 - [email protected]
+
+- update requires
+
+-------------------------------------------------------------------
+Sun Jul 7 11:25:31 UTC 2013 - [email protected]
+
+- Update to version 2013.2.a895.g75f03f3:
+ + Rename quantum to neutron in .gitreview.
+ + Rename Quantum to Neutron
+ + Sync install_venv_common from oslo
+
+-------------------------------------------------------------------
+Sat Jul 6 00:07:47 UTC 2013 - [email protected]
+
+- Update to version 2013.2.a891.gcecfe07:
+ + Allow non-root ip in subnet CIDR
+ + Fix unit test for ryu-agent
+
+-------------------------------------------------------------------
+Fri Jul 5 12:23:29 UTC 2013 - [email protected]
+
+- provide/obsolete openstack-quantum
+
+-------------------------------------------------------------------
+Thu Jul 4 08:05:12 UTC 2013 - [email protected]
+
+- Update to version 2013.2.a887.g8ceac10:
+ + Remove unused database table from Cisco plugin
+
+-------------------------------------------------------------------
+Wed Jul 3 23:46:36 UTC 2013 - [email protected]
+
+- Update to version 2013.2.a885.g5d56e6b:
+ + Imported Translations from Transifex
+ + Do not mask NotImplementedError exceptions
+
+-------------------------------------------------------------------
+Tue Jul 2 23:47:11 UTC 2013 - [email protected]
+
+- Update to version 2013.2.a882.g0fc6605:
+ + Imported Translations from Transifex
+ + Jointly load ExternalNetwork with Network
+
+-------------------------------------------------------------------
+Tue Jul 2 00:14:37 UTC 2013 - [email protected]
+
+- Update to version 2013.2.a879.g9c18ac1:
+ + Add support for moving ip/addresss/default gateway
+ + Imported Translations from Transifex
+ + Move NVP DB extensions under dbexts module.
+
+-------------------------------------------------------------------
+Mon Jul 1 00:12:24 UTC 2013 - [email protected]
+
+- Update to version 2013.2.a874.g84982e7:
+ + Imported Translations from Transifex
+
+-------------------------------------------------------------------
+Sun Jun 30 00:12:10 UTC 2013 - [email protected]
+
+- Update to version 2013.2.a873.g81c3a17:
+ + Deprecate enable_tunneling in the OVS agent
+ + Support a timeout argument when instantiating a bigswitch plugin
+ + dom0 rootwrap - case insensitive xenapi section
+ + faster quantum-openvswitch-agent periodic reports
+ + Fix case with no host_id in BigSwitch plugin
+ + Nicira plugin: Do not expect a minimum number of SNAT rules
+ + Update code to properly use dict returned from get_gateway.
+ + Remove duplicate _check_provider_update from plugins
+ + Fix logic for handling SNAT rules
+ + Improve Nicira plugin test coverage
+
+--------------------------------------------------------------------
+Sat Jun 29 00:13:04 UTC 2013 - [email protected]
+
+- Update to version 2013.2.a854.gd6a4c49:
+ + move database config items into quantum.conf
+ + Port location tracking for BigSwitch Plugin
+ + Ensure that the report state is not a blocking call
+ + Improve readability for nvplib error messages.
+ + Imported Translations from Transifex
+
+--------------------------------------------------------------------
+Fri Jun 28 00:10:22 UTC 2013 - [email protected]
+
+- Update to version 2013.2.a845.g5634c34:
+ + Imported Translations from Transifex
+ + Use 0.0.0.0/0 host route as router option
+ + Remove reference to quantum cli in provider network extension
+
+--------------------------------------------------------------------
+Thu Jun 27 00:04:39 UTC 2013 - [email protected]
+
+- Update to version 2013.2.a841.g49d7f87:
+ + Imported Translations from Transifex
+ + Require greenlet 0.3.2 (or later)
+
+--------------------------------------------------------------------
+Wed Jun 26 14:41:17 UTC 2013 - [email protected]
+
+- Update to version 2013.2.a838.g090432c:
+ + Update to use OSLO db
+
+-------------------------------------------------------------------
+Wed Jun 26 13:37:50 UTC 2013 - [email protected]
+
+- Add caching directory in /var/cache/quantum
+
+--------------------------------------------------------------------
+Wed Jun 26 00:08:51 UTC 2013 - [email protected]
+
+- Update to version 2013.2.a836.g23284e7:
+ + Converts 'router' section to lowercase in bigswitch config
+ + replace use of dhcp_lease_time with dhcp_lease_duration
+ + Imported Translations from Transifex
+ + Do not raise NEW exceptions
+
+--------------------------------------------------------------------
+Tue Jun 25 00:07:49 UTC 2013 - [email protected]
+
+- Update to version 2013.2.a830.g34c4d9c:
+ + Imported Translations from Transifex
+ + Imported Translations from Transifex
+
+-------------------------------------------------------------------
+Mon Jun 24 18:59:00 UTC 2013 - [email protected]
+
+- add 0001-Be-compatible-with-oslo.config-master.patch
+- remove quantum-test-default-state-path.patch
+
+--------------------------------------------------------------------
+Mon Jun 24 00:06:51 UTC 2013 - [email protected]
+
+- Update to version 2013.2.a828.gb4d933e:
+ + Remove single-version-externally-managed in setup.cfg
+
+--------------------------------------------------------------------
+Sat Jun 22 00:05:05 UTC 2013 - [email protected]
+
+- Update to version 2013.2.a826.g4c48e48:
+ + Fix haproxy plugin_driver.update_health_monitor() signature
+ + Imported Translations from Transifex
+ + Always include tenant_id in port delete request
+ + Adds support for router rules to Big Switch plugin
+
+--------------------------------------------------------------------
+Fri Jun 21 00:04:27 UTC 2013 - [email protected]
+
+- Update to version 2013.2.a820.gcc260d5:
+ + Make sure exceptions during policy checks are logged.
+ + Fix IP spoofing filter blocking all packets.
+ + Imported Translations from Transifex
+ + Fix single-version-externally-mananged typo in setup.cfg
+ + Adds default route to DHCP namespace for upstream name resolution.
+
+-------------------------------------------------------------------
+Thu Jun 20 13:06:42 UTC 2013 - [email protected]
+
+- update requires
+
+--------------------------------------------------------------------
+Thu Jun 20 00:04:38 UTC 2013 - [email protected]
+
+- Update to version 2013.2.a811.g248375e:
+ + Imported Translations from Transifex
+ + Imported Translations from Transifex
+ + Allow use of lowercase section names in conf files
+ + Reference default_servicetype group in lowercase
+ + Fix TestNecAgentMain not to call sys.exit()
+
+--------------------------------------------------------------------
+Wed Jun 19 00:05:32 UTC 2013 - [email protected]
+
++++ 2717 more lines (skipped)
++++ between /dev/null
++++ and
/work/SRC/openSUSE:Factory/.openstack-neutron.new/openstack-neutron.changes
New:
----
0001-Be-compatible-with-oslo.config-master.patch
_service
neutron-master.tar.gz
neutron-sudoers
neutron-suse-config-defaults.diff
openstack-neutron-doc.changes
openstack-neutron-doc.spec
openstack-neutron-plugin.init
openstack-neutron.changes
openstack-neutron.init
openstack-neutron.logrotate
openstack-neutron.spec
rpmlintrc
sysconfig.neutron
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openstack-neutron-doc.spec ++++++
#
# spec file for package openstack-neutron-doc
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define component neutron
Name: openstack-neutron-doc
Version: 2013.2.a905.g5434abb
Release: 0
Summary: OpenStack Virtual Network Service (Quantum) - Documentation
License: Apache-2.0
Group: Documentation/HTML
Url: https://launchpad.net/neutron
Source: neutron-master.tar.gz
BuildRequires: openstack-suse-macros
BuildRequires: python-Paste
BuildRequires: python-PasteDeploy
BuildRequires: python-Routes
BuildRequires: python-SQLAlchemy
BuildRequires: python-Sphinx
BuildRequires: python-WebOb
BuildRequires: python-WebTest
BuildRequires: python-alembic
BuildRequires: python-configobj
BuildRequires: python-devel
BuildRequires: python-distribute
BuildRequires: python-eventlet
BuildRequires: python-extras
BuildRequires: python-iso8601
BuildRequires: python-mock
BuildRequires: python-mox
BuildRequires: python-netaddr
BuildRequires: python-netifaces
BuildRequires: python-neutron
BuildRequires: python-neutronclient
BuildRequires: python-nose
BuildRequires: python-pyudev
BuildRequires: python-unittest2
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Quantum is a virtual network service for Openstack.
This package contains documentation files for openstack-%{component}
%prep
%setup -q -n neutron-2013.2.a905.g5434abb
%openstack_cleanup_prep
%build
python setup.py build_sphinx
rm -rf doc/build/html/.buildinfo # Remove unneeded files
%install
%files
%defattr(-,root,root,-)
%doc LICENSE doc/build/html/
%changelog
++++++ openstack-neutron.spec ++++++
#
# spec file for package openstack-neutron
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define component neutron
%define groupname openstack-%{component}
%define username openstack-%{component}
Name: openstack-neutron
Version: 2013.2.a905.g5434abb
Release: 0
Summary: OpenStack Network
License: Apache-2.0
Group: System/Management
Url: https://launchpad.net/neutron
Source: neutron-master.tar.gz
Source1: openstack-%{component}.init
Source2: %{name}.logrotate
Source3: neutron-sudoers
Source4: openstack-%{component}-plugin.init
Source5: sysconfig.neutron
Patch2: neutron-suse-config-defaults.diff
Patch3: 0001-Be-compatible-with-oslo.config-master.patch
BuildRequires: fdupes
BuildRequires: openstack-suse-macros
BuildRequires: openstack-suse-sudo
BuildRequires: openstack-utils
BuildRequires: python-d2to1
BuildRequires: python-devel
BuildRequires: python-distribute
BuildRequires: python-pbr
# Documentation build requirements:
BuildRequires: python-Sphinx
Requires: logrotate
Requires: openstack-suse-sudo
Requires: python >= 2.6.8
Requires: python-neutron = %{version}
Requires: python-oslo.config >= 1.1.0
Provides: openstack-quantum = 2013.2.0
Obsoletes: openstack-quantum < 2013.2.0
%if 0%{?suse_version} > 1110
Requires(pre): pwdutils
%else
Requires(pre): shadow-utils
%endif
%if 0%{?fedora}
Requires(pre): shadow-utils
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
%{!?python_sitelib: %global python_sitelib %(python -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
%py_requires
%else
BuildArch: noarch
%endif
PreReq: %fillup_prereq
%description
Neutron is a virtual network service for Openstack.
Just like OpenStack Nova provides an API to dynamically request and
configure virtual servers, Neutron provides an API to dynamically
request and configure virtual networks. These networks connect
"interfaces" from other OpenStack services (e.g., vNICs from Nova VMs).
The Neutron API supports extensions to provide advanced network
capabilities (e.g., QoS, ACLs, network monitoring, etc)
%package -n python-neutron
Summary: OpenStack Network - Python module
Group: Development/Languages/Python
Requires: python >= 2.6.8
Requires: python-Paste
Requires: python-PasteDeploy >= 1.5.0
Requires: python-Routes >= 1.12.3
Requires: python-SQLAlchemy >= 0.7.8
Requires: python-WebOb >= 1.2
Requires: python-alembic >= 0.4.1
Requires: python-amqplib >= 0.6.1
Requires: python-anyjson >= 0.2.4
Requires: python-d2to1 >= 0.2.10
Requires: python-eventlet >= 0.9.17
Requires: python-greenlet >= 0.3.2
Requires: python-httplib2
Requires: python-iso8601 >= 0.1.4
Requires: python-keystoneclient >= 0.2.0
Requires: python-kombu >= 1.0.4
Requires: python-netaddr
Requires: python-neutronclient >= 2.2.3
Requires: python-novaclient
Requires: python-pbr >= 0.5.16
Requires: python-pyudev
Requires: python-six
Requires: python-stevedore >= 0.9
Provides: python-quantum = 2013.2.0
Obsoletes: python-quantum < 2013.2.0
%description -n python-neutron
This package contains the core Python module of OpenStack Neutron.
%package server
Summary: OpenStack Network - Python module
Group: Development/Languages/Python
PreReq: %name = %version
Provides: openstack-quantum-server = 2013.2.0
Obsoletes: openstack-quantum-server < 2013.2.0
%description server
This package provides the Neutron server
%package dhcp-agent
Summary: OpenStack Network - DHCP Agent
Group: Development/Languages/Python
PreReq: %name = %version
Requires: dnsmasq
Provides: openstack-quantum-dhcp-agent = 2013.2.0
Obsoletes: openstack-quantum-dhcp-agent < 2013.2.0
%description dhcp-agent
This package provides the DHCP Agent.
%package hyperv-agent
Summary: OpenStack Network - Hyper-V Agent
Group: Development/Languages/Python
PreReq: %name = %version
Provides: openstack-quantum-hyperv-agent = 2013.2.0
Obsoletes: openstack-quantum-hyperv-agent < 2013.2.0
%description hyperv-agent
This package provides the Hyper-V Agent.
%package l3-agent
Summary: OpenStack Network Service (Neutron) - L3 Agent
Group: Development/Languages/Python
PreReq: %name = %version
Provides: openstack-quantum-l3-agent = 2013.2.0
Obsoletes: openstack-quantum-l3-agent < 2013.2.0
%description l3-agent
This package provides the L3 Agent.
%package lbaas-agent
Summary: OpenStack Network - Load Balancing Agent
Group: Development/Languages/Python
PreReq: %name = %version
Provides: openstack-quantum-lbaas-agent = 2013.2.0
Obsoletes: openstack-quantum-lbaas-agent < 2013.2.0
%description lbaas-agent
This package provides the Load Balancing as a Service Agent.
%package linuxbridge-agent
Summary: OpenStack Network - Linux Bridge Agent
Group: Development/Languages/Python
Provides: openstack-neutron-agent = %version
PreReq: %name = %version
Provides: openstack-quantum-linuxbridge-agent = 2013.2.0
Obsoletes: openstack-quantum-linuxbridge-agent < 2013.2.0
%description linuxbridge-agent
This package provides the Linux Bridge Agent.
%package metadata-agent
Summary: OpenStack Network - Meta Data Agent
Group: Development/Languages/Python
PreReq: %name = %version
Provides: openstack-quantum-metadata-agent = 2013.2.0
Obsoletes: openstack-quantum-metadata-agent < 2013.2.0
%description metadata-agent
This package provides the Meta Data Agent.
%package mlnx-agent
Summary: OpenStack Network - Mellanox Plugin
Group: Development/Languages/Python
PreReq: %name = %version
Provides: openstack-quantum-mlnx-agent = 2013.2.0
Obsoletes: openstack-quantum-mlnx-agent < 2013.2.0
%description mlnx-agent
This package provides the Mellanox Agent
%package nec-agent
Summary: OpenStack Network - NEC Agent
Group: Development/Languages/Python
PreReq: %name = %version
Provides: openstack-neutron-agent = %version
Provides: openstack-quantum-nec-agent = 2013.2.0
Obsoletes: openstack-quantum-nec-agent < 2013.2.0
%description nec-agent
This package provides the NEC Agent.
%package ryu-agent
Summary: OpenStack Network - ryu Agent
Group: Development/Languages/Python
Provides: openstack-neutron-agent = %version
PreReq: %name = %version
Provides: openstack-quantum-ryu-agent = 2013.2.0
Obsoletes: openstack-quantum-ryu-agent < 2013.2.0
%description ryu-agent
This package provides the ryu Agent.
%package openvswitch-agent
Summary: OpenStack Network - Open vSwitch
Group: Development/Languages/Python
Provides: openstack-neutron-agent = %version
PreReq: %name = %version
Requires: openvswitch
Provides: openstack-quantum-openvswitch-agent = 2013.2.0
Obsoletes: openstack-quantum-openvswitch-agent < 2013.2.0
%description openvswitch-agent
This package provides the OpenVSwitch Agent.
%package test
Summary: OpenStack Network - Testsuite
Group: Development/Languages/Python
Requires: %{name} = %{version}
Requires: python-WebTest >= 1.3.3
Requires: python-cliff >= 1.3.1
Requires: python-configobj
Requires: python-coverage >= 3.6
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
Requires: python-discover
%endif
Requires: python-fixtures >= 0.3.12
Requires: python-flake8 >= 2.0
Requires: python-hacking >= 0.5.3
Requires: python-mock >= 1.0b1
Requires: python-mox >= 0.5.3
Requires: python-netifaces
Requires: python-nose
Requires: python-nosehtmloutput
Requires: python-nosexcover
Requires: python-openstack.nose_plugin
Requires: python-pep8 >= 1.4.5
Requires: python-pyflakes >= 0.7.2
Requires: python-python-subunit
Requires: python-testrepository >= 0.0.13
Requires: python-testtools >= 0.9.27
Provides: openstack-quantum-test = 2013.2.0
Obsoletes: openstack-quantum-test < 2013.2.0
%description test
The OpenStack Neutron testsuite. It is used to verify the functionality
of OpenStack Neutron.
%prep
%setup -q -n neutron-2013.2.a905.g5434abb
## comment me in
# %xopenstack_cleanup_prep
%patch2
%patch3 -p1
%build
python setup.py build
python setup.py build_sphinx -b man
%install
python setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot}
--install-data=/
### directories
install -d -m 755 %{buildroot}%{_localstatedir}/run/%{component}
install -d -m 755 %{buildroot}%{_localstatedir}/log/%{component}
install -d -m 755 %{buildroot}%{_localstatedir}/lib/%{component}
### configuration files
# all needed files are installed automatically
install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
### init scripts
rm %{buildroot}%{_initddir}/%{component}-server
install -p -D -m 755 %{SOURCE1} %{buildroot}%{_initddir}/openstack-%{component}
mkdir -p %{buildroot}%{_sbindir}
ln -s ../..%{_initddir}/openstack-%{component}
%{buildroot}%{_sbindir}/rcopenstack-%{component}
agents=(\
l3-agent \
lbaas-agent \
dhcp-agent \
hyperv-agent \
openvswitch-agent \
linuxbridge-agent \
metadata-agent \
mlnx-agent \
)
agentPaths=(
/etc/%{component}/l3_agent.ini \
/etc/%{component}/lbaas_agent.ini \
/etc/%{component}/dhcp_agent.ini \
/etc/%{component}/plugins/hyperv/hyperv_neutron_plugin.ini \
/etc/%{component}/plugins/openvswitch/ovs_neutron_plugin.ini \
/etc/%{component}/plugins/linuxbridge/linuxbridge_conf.ini \
/etc/%{component}/metadata_agent.ini \
/etc/%{component}/plugins/mlnx-agent.ini \
)
for i in ${!agents[@]} ; do
install -D -m 755 %{SOURCE4}
%{buildroot}%{_initddir}/openstack-%{component}-${agents[$i]}
sed -i -e "s,__NAME__,${agents[$i]},g"
%{buildroot}%{_initddir}/openstack-%{component}-${agents[$i]}
if [ ! -z ${agentPaths[$i]} ] ; then
sed -i -e "s,__PLUGIN_CONFFILE__,${agentPaths[$i]},g"
%{buildroot}%{_initddir}/openstack-%{component}-${agents[$i]}
else
sed -i -e "s,__PLUGIN_CONFFILE__,,g"
%{buildroot}%{_initddir}/openstack-%{component}-${agents[$i]}
fi
ln -s ../..%{_initddir}/openstack-%{component}-${agents[$i]}
%{buildroot}%{_sbindir}/rcopenstack-%{component}-${agents[$i]}
done
### sudoers configuration for nova-rootwrap:
install -D -m 440 %{SOURCE3}
%{buildroot}%{_sysconfdir}/sudoers.d/openstack-neutron
### documentation
install -d %{buildroot}%{_mandir}/man1
install -m 644 doc/build/man/*.1 %{buildroot}%{_mandir}/man1
## SUSE configuration defaults
openstack-config --set %{buildroot}/etc/neutron/neutron.conf DEFAULT
core_plugin neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2
openstack-config --set %{buildroot}/etc/neutron/neutron.conf DEFAULT
root_helper "sudo neutron-rootwrap /etc/neutron/rootwrap.conf"
openstack-config --set %{buildroot}/etc/neutron/neutron.conf DEFAULT log_dir
/var/log/neutron
openstack-config --set %{buildroot}/etc/neutron/l3_agent.ini DEFAULT
external_network_bridge ""
### test subpackage
%openstack_test_package_install
%fdupes %{buildroot}%{_localstatedir}/lib/%{name}-test
#TODO/FIXME: there's an upstream discussion on how to install these,
# it's related to setuptools_git / MANIFEST.in issues.
for i in neutron/tests/unit/nicira/etc/* \
neutron/tests/etc/rootwrap.d/neutron.test.filters \
neutron/tests/etc/api-paste.ini.test \
neutron/tests/etc/neutron.conf.test ; do
install -D $i %{buildroot}%{python_sitelib}/$i
done
### sysconfig
install -d -m 755 %{buildroot}/var/adm/fillup-templates
install -m 644 %{S:5} %{buildroot}/var/adm/fillup-templates
### misc
%fdupes %{buildroot}%{python_sitelib}/%{component}
### authentication cache dir
mkdir -p %{buildroot}%{_localstatedir}/cache/%{component}
%pre
getent group %{groupname} > /dev/null || groupadd -r %{groupname}
getent passwd %{username} > /dev/null || useradd -r -g %{groupname} -d
%{_localstatedir}/lib/neutron -s /sbin/nologin -c "Openstack Neutron Daemons"
%{username}
exit 0
%post server
%{fillup_and_insserv -f openstack-%{component}}
%preun server
%stop_on_removal openstack-%{component}
%postun server
%restart_on_update openstack-%{component}
%insserv_cleanup
%post
%{fillup_only -n neutron}
%files
%defattr(-,root,root,-)
%doc LICENSE README.rst
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config %{_sysconfdir}/sudoers.d/openstack-neutron
%dir %{_sysconfdir}/%{component}
%config(noreplace) %{_sysconfdir}/%{component}/api-paste.ini
%config %{_sysconfdir}/%{component}/policy.json
%config(noreplace) %attr(0640, root, %{groupname})
%{_sysconfdir}/%{component}/neutron.conf
%config %{_sysconfdir}/%{component}/rootwrap.conf
%dir %{_sysconfdir}/%{component}/rootwrap.d/
%ghost %dir %attr(0755, %{username}, root) %{_localstatedir}/run/%{component}
%dir %attr(0755, %{username}, root) %{_localstatedir}/lib/%{component}
%dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/cache/%{component}
%dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/log/%{component}
%dir %{_sysconfdir}/%{component}/plugins
%dir %{_sysconfdir}/%{component}/plugins/bigswitch/
%dir %{_sysconfdir}/%{component}/plugins/brocade/
%dir %{_sysconfdir}/%{component}/plugins/cisco/
%dir %{_sysconfdir}/%{component}/plugins/hyperv/
%dir %{_sysconfdir}/%{component}/plugins/metaplugin/
%dir %{_sysconfdir}/%{component}/plugins/midonet
%dir %{_sysconfdir}/%{component}/plugins/ml2
%dir %{_sysconfdir}/%{component}/plugins/nec/
%dir %{_sysconfdir}/%{component}/plugins/nicira/
%dir %{_sysconfdir}/%{component}/plugins/plumgrid/
%dir %{_sysconfdir}/%{component}/plugins/ryu/
%config(noreplace) %{_sysconfdir}/%{component}/plugins/bigswitch/restproxy.ini
%config(noreplace) %{_sysconfdir}/%{component}/plugins/cisco/cisco_plugins.ini
%config(noreplace)
%{_sysconfdir}/%{component}/plugins/hyperv/hyperv_neutron_plugin.ini
%config(noreplace)
%{_sysconfdir}/%{component}/plugins/linuxbridge/linuxbridge_conf.ini
%config(noreplace) %{_sysconfdir}/%{component}/plugins/metaplugin/metaplugin.ini
%config(noreplace) %{_sysconfdir}/%{component}/plugins/midonet/midonet.ini
%config(noreplace) %{_sysconfdir}/%{component}/plugins/ml2/ml2_conf.ini
%config(noreplace) %{_sysconfdir}/%{component}/plugins/nec/nec.ini
%config(noreplace) %{_sysconfdir}/%{component}/plugins/nicira/nvp.ini
%config(noreplace) %{_sysconfdir}/%{component}/plugins/brocade/brocade.ini
%config(noreplace) %{_sysconfdir}/%{component}/plugins/plumgrid/plumgrid.ini
%config(noreplace)
%{_sysconfdir}/%{component}/plugins/openvswitch/ovs_neutron_plugin.ini
%config(noreplace) %{_sysconfdir}/%{component}/plugins/ryu/ryu.ini
%config %{_sysconfdir}/%{component}/rootwrap.d/iptables-firewall.filters
%{_bindir}/%{component}-debug
%{_bindir}/quantum-debug
%{_bindir}/%{component}-check-nvp-config
%{_bindir}/quantum-check-nvp-config
%{_bindir}/%{component}-netns-cleanup
%{_bindir}/quantum-netns-cleanup
%{_bindir}/%{component}-ns-metadata-proxy
%{_bindir}/quantum-ns-metadata-proxy
%{_bindir}/%{component}-rootwrap
%{_bindir}/quantum-rootwrap
%{_mandir}/man1/%{component}-server.1%{?ext_man}
/var/adm/fillup-templates/sysconfig.neutron
%files dhcp-agent
%defattr(-,root,root,-)
%doc LICENSE
%{_bindir}/%{component}-dhcp-agent
%{_bindir}/quantum-dhcp-agent
%{_bindir}/%{component}-dhcp-agent-dnsmasq-lease-update
%{_bindir}/quantum-dhcp-agent-dnsmasq-lease-update
%{_initddir}/openstack-%{component}-dhcp-agent
%{_sbindir}/rcopenstack-%{component}-dhcp-agent
%config(noreplace) %{_sysconfdir}/%{component}/dhcp_agent.ini
%config %{_sysconfdir}/%{component}/rootwrap.d/dhcp.filters
%files hyperv-agent
%defattr(-,root,root,-)
%doc LICENSE
%{_bindir}/%{component}-hyperv-agent
%{_bindir}/quantum-hyperv-agent
%{_initddir}/openstack-%{component}-hyperv-agent
%{_sbindir}/rcopenstack-%{component}-hyperv-agent
%dir %{_sysconfdir}/%{component}/plugins/hyperv/
%files l3-agent
%defattr(-,root,root,-)
%doc LICENSE
%{_bindir}/%{component}-l3-agent
%{_bindir}/quantum-l3-agent
%config %{_sysconfdir}/%{component}/rootwrap.d/l3.filters
%config(noreplace) %{_sysconfdir}/%{component}/l3_agent.ini
%{_initddir}/openstack-%{component}-l3-agent
%{_sbindir}/rcopenstack-%{component}-l3-agent
%files lbaas-agent
%defattr(-,root,root,-)
%doc LICENSE
%{_bindir}/%{component}-lbaas-agent
%{_bindir}/quantum-lbaas-agent
%config(noreplace) %{_sysconfdir}/%{component}/lbaas_agent.ini
%config %{_sysconfdir}/%{component}/rootwrap.d/lbaas-haproxy.filters
%{_initddir}/openstack-%{component}-lbaas-agent
%{_sbindir}/rcopenstack-%{component}-lbaas-agent
%files metadata-agent
%defattr(-,root,root,-)
%doc LICENSE
%config(noreplace) %{_sysconfdir}/%{component}/metadata_agent.ini
%{_bindir}/%{component}-metadata-agent
%{_bindir}/quantum-metadata-agent
%{_initddir}/openstack-%{component}-metadata-agent
%{_sbindir}/rcopenstack-%{component}-metadata-agent
%files mlnx-agent
%defattr(-,root,root,-)
%doc LICENSE
%dir %{_sysconfdir}/%{component}/plugins/mlnx
%config(noreplace) %{_sysconfdir}/%{component}/plugins/mlnx/mlnx_conf.ini
%{_bindir}/%{component}-mlnx-agent
%{_bindir}/quantum-mlnx-agent
%{_initddir}/openstack-%{component}-mlnx-agent
%{_sbindir}/rcopenstack-%{component}-mlnx-agent
%files nec-agent
%defattr(-,root,root,-)
%doc LICENSE
%config %{_sysconfdir}/%{component}/rootwrap.d/nec-plugin.filters
%{_bindir}/%{component}-nec-agent
%{_bindir}/quantum-nec-agent
%files ryu-agent
%defattr(-,root,root,-)
%doc LICENSE
%config %{_sysconfdir}/%{component}/rootwrap.d/ryu-plugin.filters
%{_bindir}/%{component}-ryu-agent
%{_bindir}/quantum-ryu-agent
%files linuxbridge-agent
%defattr(-,root,root,-)
%doc LICENSE
%{_bindir}/%{component}-linuxbridge-agent
%{_bindir}/quantum-linuxbridge-agent
%config %{_sysconfdir}/%{component}/rootwrap.d/linuxbridge-plugin.filters
%dir %{_sysconfdir}/%{component}/plugins/linuxbridge/
%{_initddir}/openstack-%{component}-linuxbridge-agent
%{_sbindir}/rcopenstack-%{component}-linuxbridge-agent
%files openvswitch-agent
%defattr(-,root,root,-)
%doc LICENSE
%dir %{_sysconfdir}/%{component}/plugins/openvswitch/
%{_bindir}/%{component}-openvswitch-agent
%{_bindir}/quantum-openvswitch-agent
%{_bindir}/%{component}-ovs-cleanup
%{_bindir}/quantum-ovs-cleanup
%config %{_sysconfdir}/%{component}/rootwrap.d/openvswitch-plugin.filters
%{_initddir}/openstack-%{component}-openvswitch-agent
%{_sbindir}/rcopenstack-%{component}-openvswitch-agent
%files server
%defattr(-,root,root,-)
%doc LICENSE
%{_bindir}/%{component}-server
%{_bindir}/quantum-server
%{_bindir}/%{component}-db-manage
%{_bindir}/quantum-db-manage
%{_initddir}/openstack-%{component}
%{_sbindir}/rcopenstack-%{component}
%files -n python-neutron
%defattr(-,root,root,-)
%doc LICENSE
%{python_sitelib}/%{component}/
%{python_sitelib}/quantum
%{python_sitelib}/%{component}-*.egg-info
# Part of test subpackage
%exclude %{python_sitelib}/%{component}/tests/
%files test
%defattr(-,root,root)
%{python_sitelib}/%{component}/tests/
%{_localstatedir}/lib/%{name}-test/
%changelog
++++++ 0001-Be-compatible-with-oslo.config-master.patch ++++++
>From 25cbd893a7102044b393337a6d57a6d72140339f Mon Sep 17 00:00:00 2001
From: Dirk Mueller <[email protected]>
Date: Mon, 24 Jun 2013 20:56:32 +0200
Subject: [PATCH] Be compatible with oslo.config master
The private API of oslo.config changed, so this
code failed when run against current oslo.config master.
Simply use the collections.Mapping public interface
instead for iterating over the configs.
Change-Id: I7ffcac3c295491fe9ba8abc7e98f33157a48c51b
---
quantum/plugins/cisco/common/config.py | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/quantum/plugins/cisco/common/config.py
b/quantum/plugins/cisco/common/config.py
index 38f0cd3..523d74a 100644
--- a/neutron/plugins/cisco/common/config.py
+++ b/neutron/plugins/cisco/common/config.py
@@ -93,12 +93,16 @@ class CiscoConfigOptions():
Reads data from cisco_plugins.ini NEXUS_SWITCH section(s).
"""
- for parsed_file in cfg.CONF._cparser.parsed:
- for parsed_item in parsed_file.keys():
- nexus_name, sep, nexus_ip = parsed_item.partition(':')
- if nexus_name == 'NEXUS_SWITCH':
- for nexus_key, value in parsed_file[parsed_item].items():
+
+ for parsed_item in cfg.CONF:
+ nexus_name, sep, nexus_ip = parsed_item.partition(':')
+ if nexus_name == 'NEXUS_SWITCH':
+ try:
+ for nexus_key, value in cfg.CONF.parsed_item.items():
nexus_dictionary[nexus_ip, nexus_key] = value[0]
+ except AttributeError:
+ # it wasn't a group, ignore
+ pass
def get_nexus_dictionary():
--
1.8.3.1
++++++ _service ++++++
<services>
<service name="git_tarballs" mode="disabled">
<param
name="url">http://tarballs.openstack.org/neutron/neutron-master.tar.gz</param>
<param name="email">[email protected]</param>
<param name="plain-version">True</param>
</service>
</services>
++++++ neutron-sudoers ++++++
openstack-quantum ALL = (root) NOPASSWD: /usr/bin/quantum-rootwrap
/etc/quantum/rootwrap.conf *
++++++ neutron-suse-config-defaults.diff ++++++
Index: etc/dhcp_agent.ini
===================================================================
--- etc/dhcp_agent.ini.orig
+++ etc/dhcp_agent.ini
@@ -11,12 +11,12 @@
# matches you plugin.
# OVS based plugins(OVS, Ryu, NEC, NVP, BigSwitch/Floodlight)
-interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
+#interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
# OVS based plugins(Ryu, NEC, NVP, BigSwitch/Floodlight) that use OVS
# as OpenFlow switch and check port status
#ovs_use_veth = True
# LinuxBridge
-#interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
+interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
# The agent can use other DHCP drivers. Dnsmasq is the simplest and requires
# no additional setup of the DHCP server.
Index: etc/l3_agent.ini
===================================================================
--- etc/l3_agent.ini.orig
+++ etc/l3_agent.ini
@@ -6,12 +6,12 @@
# matches your plugin.
# OVS based plugins (OVS, Ryu, NEC) that supports L3 agent
-interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
+#interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
# OVS based plugins(Ryu, NEC) that use OVS
# as OpenFlow switch and check port status
#ovs_use_veth = True
# LinuxBridge
-#interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
+interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
# Allow overlapping IP (Must have kernel build with CONFIG_NET_NS=y and
# iproute2 package that supports namespaces).
@@ -36,7 +36,7 @@ interface_driver = neutron.agent.linux.i
# Name of bridge used for external network traffic. This should be set to
# empty value for the linux bridge
-# external_network_bridge = br-ex
+external_network_bridge = br-ex
# TCP Port used by Neutron metadata server
# metadata_port = 9697
Index: etc/neutron.conf
===================================================================
--- etc/neutron.conf.orig
+++ etc/neutron.conf
@@ -27,7 +27,7 @@ lock_path = $state_path/lock
# use_stderr = True
# log_file =
-# log_dir =
+log_dir = /var/log/quantum
# publish_errors = False
@@ -45,7 +45,7 @@ bind_port = 9696
# api_extensions_path =
# Quantum plugin provider module
-# core_plugin =
+core_plugin =
quantum.plugins.linuxbridge.lb_quantum_plugin.LinuxBridgePluginV2
# Advanced service modules
# service_plugins =
@@ -300,7 +300,7 @@ notification_topics = notifications
# Use "sudo quantum-rootwrap /etc/quantum/rootwrap.conf" to use the real
# root filter facility.
# Change to "sudo" to skip the filtering and just run the comand directly
-# root_helper = sudo
+root_helper = sudo quantum-rootwrap /etc/quantum/rootwrap.conf
# =========== items for agent management extension =============
# seconds between nodes reporting state to server, should be less than
++++++ openstack-neutron-plugin.init ++++++
#!/bin/bash
### BEGIN INIT INFO
# Provides: openstack-neutron-__NAME__
# Required-Start: $remote_fs $syslog
# Required-Stop: $remote_fs $syslog
# Should-Start: mysql postgresql rabbitmq-server
# Should-Stop: mysql postgresql rabbitmq-server
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
# Short-Description: OpenStack Compute (Quantum) - __NAME__
# Description: OpenStack Compute (Quantum) - __NAME__
### END INIT INFO
DAEMON="__NAME__"
USER="openstack-neutron"
CONFFILE="/etc/neutron/neutron.conf"
RUNDIR="/var/run/neutron"
NEUTRON_PLUGIN_CONF="__PLUGIN_CONFFILE__"
NEUTRON_PLUGIN_ARGS=""
if [ ! -z $NEUTRON_PLUGIN_CONF ] && [ $NEUTRON_PLUGIN_CONF != "" ] ; then
PLUGIN_ARGS="$NEUTRON_PLUGIN_ARGS --config-file=$NEUTRON_PLUGIN_CONF"
fi
# $RUNDIR can be tmpfs, thus we have to create/own it here:
mkdir -p $RUNDIR && chown $USER. $RUNDIR
. /etc/rc.status
case "$1" in
start)
echo -n "Starting neutron-$DAEMON"
/sbin/startproc -q -s -u $USER /usr/bin/neutron-$DAEMON
--config-file=$CONFFILE $PLUGIN_ARGS
rc_status -v
;;
stop)
echo -n "Shutting down neutron-$DAEMON"
/sbin/killproc /usr/bin/neutron-$DAEMON
rc_status -v
;;
restart)
$0 stop
$0 start
rc_status
;;
force-reload)
$0 try-restart
rc_status
;;
reload)
echo -n "Reload service neutron-$DAEMON"
rc_failed 3
rc_status -v
;;
status)
echo -n "Checking for service neutron-$DAEMON"
/sbin/checkproc /usr/bin/neutron-$DAEMON
rc_status -v
;;
try-restart|condrestart)
if test "$1" = "condrestart"; then
echo "${attn} Use try-restart ${done}(LSB)${attn} rather than
condrestart ${warn}(RH)${norm}"
fi
$0 status
if test $? = 0; then
$0 restart
else
rc_reset # Not running is not a failure.
fi
rc_status # Remember status and be quiet
;;
*)
echo "Usage: $0
{start|stop|status|try-restart|restart|force-reload|reload}"
exit 1
;;
esac
rc_exit
++++++ openstack-neutron.init ++++++
#! /bin/sh
### BEGIN INIT INFO
# Provides: neutron-server
# Required-Start: $remote_fs $syslog
# Required-Stop: $remote_fs $syslog
# Default-Start: 2 3 5
# Default-Stop: 0 1 6
# Short-Description: neutron-server
# Description: Provides the Neutron networking service
### END INIT INFO
NEUTRON_LOGFILE="/var/log/neutron/neutron-server.log"
NEUTRON_SYSCONFIG=/etc/sysconfig/neutron
test -r $NEUTRON_SYSCONFIG || exit 6
. $NEUTRON_SYSCONFIG
USER="openstack-neutron"
DAEMON=/usr/bin/neutron-server
DAEMON_ARGS="--log-file=$NEUTRON_LOGFILE
--config-file=/etc/neutron/neutron.conf --config-file=$NEUTRON_PLUGIN_CONF"
DAEMON_DIR=/var/run
export TMPDIR=/var/lib/neutron/tmp
if [ ! -x ${DAEMON} ] ; then
exit 0
fi
. /etc/rc.status
case "$1" in
start)
echo -n "Checking for DB Migrations"
/usr/bin/neutron-db-manage check_migration
rc_status -v
echo -n "Starting neutron server"
startproc -t ${STARTUP_TIMEOUT:-5} -q -s -u $USER $DAEMON $DAEMON_ARGS
rc_status -v
;;
stop)
echo -n "Stopping neutron server"
killproc $DAEMON
rc_status -v
;;
restart|force-reload)
$0 stop
sleep 1
$0 start
;;
reload)
;;
status)
echo -n "Checking status of neutron server"
/sbin/checkproc $DAEMON
rc_status -v
;;
*)
echo $"Usage: $0 {start|stop|restart|force-reload|status}"
exit 2
;;
esac
exit $?
++++++ openstack-neutron.logrotate ++++++
/var/log/quantum/*.log {
rotate 15
size 1M
weekly
dateext
missingok
notifempty
su openstack-quantum openstack-quantum
sharedscripts
}
++++++ rpmlintrc ++++++
# This symling is for the -test package and can be ignored:
addFilter("dangling-symlink /var/lib/openstack-quantum-test/quantum")
++++++ sysconfig.neutron ++++++
## Type: string
#
# location of the plugin configuration file
QUANTUM_PLUGIN_CONF="/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini"
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
