Hello community, here is the log from the commit of package openstack-quantum for openSUSE:Factory checked in at 2013-04-24 16:06:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-quantum (Old) and /work/SRC/openSUSE:Factory/.openstack-quantum.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-quantum", Maintainer is "radma...@suse.com" Changes: -------- New Changes file: --- /dev/null 2013-04-05 00:01:41.916011506 +0200 +++ /work/SRC/openSUSE:Factory/.openstack-quantum.new/openstack-quantum-doc.changes 2013-04-24 16:06:45.000000000 +0200 @@ -0,0 +1,15 @@ +------------------------------------------------------------------- +Mon Mar 18 10:59:30 UTC 2013 - speili...@suse.com + +- Drop +git.$TIMESTAMP.$COMMITHASH version suffix + +------------------------------------------------------------------- +Fri Feb 22 11:24:49 UTC 2013 - sasc...@suse.de + +- BuildRequire openstack-suse-macros instead of openstack-macros + +------------------------------------------------------------------- +Mon Jan 14 13:41:52 UTC 2013 - sasc...@suse.de + +- Initial version + --- /work/SRC/openSUSE:Factory/openstack-quantum/openstack-quantum.changes 2013-04-02 12:33:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openstack-quantum.new/openstack-quantum.changes 2013-04-24 16:06:45.000000000 +0200 @@ -0,0 +1,132 @@ +------------------------------------------------------------------- +Fri Apr 5 13:41:36 UTC 2013 - tpaszkow...@novell.com + +- set linuxbridge as default interface driver for dhcp and l3 agents + +------------------------------------------------------------------- +Fri Apr 5 13:02:38 UTC 2013 - tpaszkow...@novell.com + +- quantum-server is now started with non-root privileges +- /var/lib/quantum is now created during installation with proper permissions + +------------------------------------------------------------------- +Thu Apr 4 16:35:53 UTC 2013 - dmuel...@suse.com + +- grizzly-stable update + +------------------------------------------------------------------- +Tue Apr 2 17:10:14 UTC 2013 - tpaszkow...@novell.com + +- Fix for metadata agent init script. + +------------------------------------------------------------------- +Tue Mar 26 12:35:19 UTC 2013 - dmuel...@suse.com + +- downgrade to 2013.1.rc2 + +-------------------------------------------------------------------- +Mon Mar 25 11:10:01 UTC 2013 - cloud-de...@suse.de + +- Update to version 2013.2.a295.g7ef4d88: + + Synchronize QuantumManager.get_instance() method + + Allow tests in TestDhcpAgentEventHandler run independently + + Improve test coverage for quantum wsgi module + + Validate protocol when creating VIP. + + Imported Translations from Transifex + + Add scheduling support for the Brocade plugin + + fix mis-placed paren in log statement for l3-scheduler + + Set fake rpc implementation in test_lb_quantum_agent + + Fix haproxy cfg unit test + + Load all the necessary database tables when running cisco plugin + + Add bulking support for Cisco plugin + + Imported Translations from Transifex + + Fix DB query returning ready devices in LoadBalancerCallbacks + + Fix typo in policy.json and checks in nicira plugin + + Imported Translations from Transifex + + NVP metadata access - create elevated context once + + Ensure that lockfile are defined in a common place + + Fix race condition in dhcp agent + + NVP metadata access - create elevated context once + + Imported Translations from Transifex + + adding parameter to configure QueuePool in SQLAlchemy + + Fix issues with db pooling + + Fixing the syntax error in the XML Serializer + + use the fact that empty sequences are false + + Imported Translations from Transifex + + Revert back to 'call' for agent reports + + Imported Translations from Transifex + + Raise VipExists exception in case Vip is created or updated for a pool that already has a Vip + + netns: ip netns exec <name> kill doesn't make sense + +------------------------------------------------------------------- +Tue Mar 19 08:10:27 UTC 2013 - dmuel...@suse.com + +- add iptables-firewall.filters.patch and temporarily + comment out the osloconfig/rootwrap merge as it seems + to have more issues that need fixing first + +------------------------------------------------------------------- +Mon Mar 18 14:50:36 UTC 2013 - dmuel...@suse.com + +- Update to version 2013.2.a248.g711f949: + + Merge "Adds delete-orphan to database deletion." + + Imported Translations from Transifex + + Imported Translations from Transifex + + Imported Translations from Transifex + + Merge "Pin SQLAlchemy to 0.7.x" + + Merge "Set fake rpc backend impl for TestLinuxBridgeAgent" + + Merge "Registers root_helper option for test_iptables_firewall" + + Pin SQLAlchemy to 0.7.x + + Adds delete-orphan to database deletion. + + Merge "Do not disable propagate on root logger" + + Imported Translations from Transifex + + Do not disable propagate on root logger + + Registers root_helper option for test_iptables_firewall + + Resolves ryu plugin unittest errors + + Imported Translations from Transifex + + Sync latest Oslo components for updated copyright. + + Merge "drop rfc.sh" + + drop rfc.sh + + Replace "OpenStack LLC" with "OpenStack Foundation" + + sync Oslo Grizzly stable branch with Quantum + + Merge "Switch to final 1.1.0 oslo.config release" + + Merge "First havana commit." + + First havana commit. + + Switch to final 1.1.0 oslo.config release + + Set fake rpc backend impl for TestLinuxBridgeAgent + + +------------------------------------------------------------------- +Mon Mar 18 10:59:25 UTC 2013 - speili...@suse.com + +- Drop +git.$TIMESTAMP.$COMMITHASH version suffix + +-------------------------------------------------------------------- +Mon Mar 18 09:31:20 CET 2013 - bere...@b1-systems.de + +- introduced sysconfig file to be able to specify the location + of the plugin configuration used in several init scripts + +-------------------------------------------------------------------- +Sun Mar 17 11:33:40 UTC 2013 - dmuel...@suse.com + +- Update to version 2013.1.a229.g3299621+git.1363520020.3299621: + + Add l3 db migration for plugins which did not support in folsom + + remove references to netstack in setup.py + + port_security migration does not migrate data + + Ensure port get works when NVP mapping not stored in Quantum DB + + Imported Translations from Transifex + + Switch to final 1.1.0 oslo.config release + + sync Oslo Grizzly stable branch with Quantum + + Replace "OpenStack LLC" with "OpenStack Foundation" + + drop rfc.sh + + Sync latest Oslo components for updated copyright. + +------------------------------------------------------------------- +Fri Mar 15 16:19:04 UTC 2013 - dmuel...@suse.com + +- add 0001-Use-exec_dirs-for-rootwrap-commands.patch: + * use exec_dirs for rootwrap configuration +- drop iptables-firewall.filters.patch: + * obsoleted by above patch +- Add requires to openvswitch + @@ -2 +134 @@ -Sun Mar 24 00:03:55 UTC 2013 - cloud-de...@suse.de +Fri Mar 15 07:52:06 CET 2013 - bere...@b1-systems.de @@ -4 +136,58 @@ -- Update to version 2012.2.4+git.1364083435.a109f7e: +- added noreplace to configuration files to not overwrite them + when updating the packages + +-------------------------------------------------------------------- +Thu Mar 14 15:27:01 CET 2013 - bere...@b1-systems.de + +- iptables-firewall.filters.patch added to adapt the + locations of the iptables binaries in the configuration + quantum/rootwrap.d/iptables-firewall.filters + +-------------------------------------------------------------------- +Thu Mar 14 15:08:47 CET 2013 - bere...@b1-systems.de + +- use $PLUGIN_ARGS in openstack-quantum-plugin.init as arguments + for the service to be started + +-------------------------------------------------------------------- +Thu Mar 14 10:30:13 CET 2013 - bere...@b1-systems.de + +- added init script for metadata-agent +- fixed wrong SED statement for replacing __NAME__ in the init + script template + +-------------------------------------------------------------------- +Thu Mar 14 10:23:41 CET 2013 - bere...@b1-systems.de + +- added missing requirement python-novaclient to python-quantum + +-------------------------------------------------------------------- +Wed Mar 13 16:20:19 CET 2013 - bere...@b1-systems.de + +- added missing %config parameters + +-------------------------------------------------------------------- +Wed Mar 13 00:10:14 UTC 2013 - cloud-de...@suse.de + +- Update to version 2013.1.a213.gd20a1f3+git.1363133414.d20a1f3: + + Imported Translations from Transifex + + Update oslo rpc libraries + + Updates latest OSLO changes + + Adds Grizzly migration revision + + Fix detection of deleted networks in DHCP agent. + +------------------------------------------------------------------- +Tue Mar 12 22:10:33 UTC 2013 - dmuel...@suse.com + +- add sqlalchemy-update.diff: + * make it compatible with sqlalchemy 0.7.10 + +------------------------------------------------------------------- +Tue Mar 12 10:51:37 UTC 2013 - dmuel...@suse.com + +- python-oslo-config -> python-oslo.config + +-------------------------------------------------------------------- +Tue Mar 12 00:04:41 UTC 2013 - cloud-de...@suse.de + +- Update to version 2013.1.a204.g6b9ce70+git.1363046681.6b9ce70: @@ -6 +195 @@ - + Ensure that l3 agent creates client session if necessary ++++ 1761 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/openstack-quantum/openstack-quantum.changes ++++ and /work/SRC/openSUSE:Factory/.openstack-quantum.new/openstack-quantum.changes Old: ---- quantum-stable-folsom.tar.gz New: ---- 0001-Use-exec_dirs-for-rootwrap-commands.patch 0002-restore-extra-filters.diff ignore-kombu-version.diff iptables-firewall.filters.patch openstack-quantum-doc.changes openstack-quantum-doc.spec openstack-quantum-plugin.init quantum-stable-grizzly.tar.gz quantum-sudoers quantum-suse-config-defaults.diff quantum-test-default-state-path.patch sqlalchemy-update.diff sysconfig.quantum ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-quantum-doc.spec ++++++ # # spec file for package openstack-quantum-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 quantum Name: openstack-%{component}-doc Version: 2013.1 Release: 0 Summary: OpenStack Virtual Network Service (Quantum) - Documentation License: Apache-2.0 Group: Documentation/HTML Url: https://launchpad.net/quantum Source: quantum-stable-grizzly.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-nose BuildRequires: python-pyudev BuildRequires: python-quantum BuildRequires: python-quantumclient 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-quantum. %prep %setup -q -n quantum-2013.1 %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-quantum.spec ++++++ --- /var/tmp/diff_new_pack.G8R0Zp/_old 2013-04-24 16:06:47.000000000 +0200 +++ /var/tmp/diff_new_pack.G8R0Zp/_new 2013-04-24 16:06:47.000000000 +0200 @@ -21,22 +21,38 @@ %define username openstack-%{component} Name: openstack-%{component} -Version: 2012.2.4+git.1364083435.a109f7e -Release: 1 -License: Apache-2.0 +Version: 2013.1 +Release: 0 Summary: OpenStack Virtual Network Service (Quantum) -Url: https://launchpad.net/quantum +License: Apache-2.0 Group: System/Management -Source: quantum-stable-folsom.tar.gz -Source1: openstack-quantum.init +Url: https://launchpad.net/quantum +Source: quantum-stable-grizzly.tar.gz +Source1: openstack-%{component}.init Source2: %{name}.logrotate +Source3: quantum-sudoers +Source4: openstack-%{component}-plugin.init +Source5: sysconfig.quantum +# PATCH-FIX-OPENSUSE: sasc...@suse.de -- Our testing state path is "/var/lib/openstack-quantum-test", not %python_sitelib +Patch0: quantum-test-default-state-path.patch +# PATCH-FIX-OPENSUSE: dmuel...@suse.com - also accept newer kombu versions +Patch1: ignore-kombu-version.diff +Patch2: quantum-suse-config-defaults.diff +Patch5: 0001-Use-exec_dirs-for-rootwrap-commands.patch +Patch6: 0002-restore-extra-filters.diff +Patch99: iptables-firewall.filters.patch BuildRequires: fdupes -BuildRequires: openstack-macros -BuildRequires: python-Sphinx -BuildRequires: python-base +BuildRequires: openstack-suse-macros +BuildRequires: openstack-suse-sudo +BuildRequires: openstack-utils +BuildRequires: python-devel BuildRequires: python-distribute +# Documentation build requirements: +BuildRequires: python-Sphinx Requires: logrotate +Requires: openstack-suse-sudo Requires: python >= 2.6.8 +Requires: python-oslo.config Requires: python-quantum = %{version} %if 0%{?suse_version} > 1110 Requires(pre): pwdutils @@ -53,6 +69,7 @@ %else BuildArch: noarch %endif +PreReq: %fillup_prereq %description Quantum is a virtual network service for Openstack. @@ -65,53 +82,140 @@ capabilities (e.g., QoS, ACLs, network monitoring, etc) %package -n python-quantum + Summary: OpenStack Virtual Network Service (Quantum) - Python module Group: Development/Languages/Python Requires: python >= 2.6.8 Requires: python-Paste Requires: python-PasteDeploy -Requires: python-Routes +Requires: python-Routes >= 1.12.3 Requires: python-SQLAlchemy -Requires: python-WebOb -Requires: python-amqplib +Requires: python-WebOb >= 1.0.8 +Requires: python-alembic +Requires: python-alembic >= 0.4.1 +Requires: python-amqplib >= 0.6.1 Requires: python-anyjson -Requires: python-eventlet +Requires: python-argparse +Requires: python-eventlet >= 0.9.17 +Requires: python-extras Requires: python-greenlet Requires: python-httplib2 -Requires: python-iso8601 -Requires: python-kombu -Requires: python-lxml +Requires: python-iso8601 >= 0.1.4 +Requires: python-keystoneclient >= 0.2.0 +Requires: python-kombu >= 2.0.0 Requires: python-netaddr +Requires: python-novaclient Requires: python-pyudev Requires: python-quantumclient %description -n python-quantum This package contains the core Python module of OpenStack Quantum. -%package doc -Summary: OpenStack Virtual Network Service (Quantum) - Documentation -Group: Documentation/HTML +%package server +Summary: OpenStack Virtual Network Service (Quantum) - Python module +Group: Development/Languages/Python +PreReq: %name = %version +Requires: python >= 2.6.8 -%description doc -Quantum is a virtual network service for Openstack. +%description server +This package provides the Quantum server + +%package dhcp-agent +Summary: OpenStack Virtual Network Service (Quantum) - DHCP Agent +Group: Development/Languages/Python +PreReq: %name = %version +Requires: python >= 2.6.8 + +%description dhcp-agent +This package provides the DHCP Agent. + +%package l3-agent +Summary: OpenStack Virtual Network Service (Quantum) - L3 Agent +Group: Development/Languages/Python +PreReq: %name = %version +Requires: python >= 2.6.8 + +%description l3-agent +This package provides the L3 Agent. + +%package lbaas-agent +Summary: OpenStack Virtual Network Service (Quantum) - Load Balancing Agent +Group: Development/Languages/Python +PreReq: %name = %version +Requires: python >= 2.6.8 + +%description lbaas-agent +This package provides the Load Balancing as a Service Agent. + + +%package linuxbridge-agent +Summary: OpenStack Virtual Network Service (Quantum) - Linux Bridge Agent +Group: Development/Languages/Python +Provides: openstack-quantum-agent = %version +PreReq: %name = %version +Requires: python >= 2.6.8 + +%description linuxbridge-agent +This package provides the Linu xBridge Agent. + +%package metadata-agent +Summary: OpenStack Virtual Network Service (Quantum) - Meta Data Agent +Group: Development/Languages/Python +PreReq: %name = %version +Requires: python >= 2.6.8 + +%description metadata-agent +This package provides the Meta Data Agent. + +%package nec-agent +Summary: OpenStack Virtual Network Service (Quantum) - NEC Agent +Group: Development/Languages/Python +PreReq: %name = %version +Provides: openstack-quantum-agent = %version +Requires: python >= 2.6.8 + +%description nec-agent +This package provides the NEC Agent. + +%package ryu-agent +Summary: OpenStack Virtual Network Service (Quantum) - ryu Agent +Group: Development/Languages/Python +Provides: openstack-quantum-agent = %version +PreReq: %name = %version +Requires: python >= 2.6.8 + +%description ryu-agent +This package provides the ryu Agent. + +%package openvswitch-agent +Summary: OpenStack Virtual Network Service (Quantum) - Open vSwitch +Group: Development/Languages/Python +Provides: openstack-quantum-agent = %version +PreReq: %name = %version +Requires: openvswitch +Requires: python >= 2.6.8 + +%description openvswitch-agent +This package provides the OpenVSwitch Agent. -This package contains documentation files for openstack-quantum. %package test + Summary: OpenStack Virtual Network Service (Quantum) - Testsuite Group: Development/Languages/Python Requires: %{name} = %{version} Requires: python-WebTest -Requires: python-cliff +Requires: python-cliff >= 1.3.1 Requires: python-configobj Requires: python-coverage -Requires: python-mock +Requires: python-mock >= 1.0b1 Requires: python-mox Requires: python-nose Requires: python-nosehtmloutput Requires: python-nosexcover Requires: python-openstack.nose_plugin Requires: python-pep8 +Requires: python-routes Requires: python-unittest2 %description test @@ -119,27 +223,27 @@ of OpenStack Quantum. %prep -%setup -q -n quantum-2012.2.4 +%setup -q -n quantum-2013.1 %openstack_cleanup_prep -# FIX-UPSTREAM sasc...@suse.de -- Backport of https://review.openstack.org/17337 -rm {bin,tools}/__init__.py +%patch0 +%patch1 +%patch2 -p2 + +#patch5 -p1 +#patch6 +%patch99 -p1 %build python setup.py build -python setup.py build_sphinx python setup.py build_sphinx -b man %install python setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot} --install-data=/ -# Fix python-bytecode-inconsistent-mtime: -pushd %{buildroot}%{python_sitelib} -%py_compile . -popd - ### directories install -d -m 755 %{buildroot}%{_localstatedir}/run/quantum install -d -m 755 %{buildroot}%{_localstatedir}/log/quantum +install -d -m 755 %{buildroot}%{_localstatedir}/lib/quantum ### configuration files # all needed files are installed automatically @@ -151,12 +255,46 @@ mkdir -p %{buildroot}%{_sbindir} ln -s ../..%{_initddir}/%{name} %{buildroot}%{_sbindir}/rc%{name} +agents=(\ + l3-agent \ + lbaas-agent \ + dhcp-agent \ + openvswitch-agent \ + linuxbridge-agent \ + metadata-agent \ +) +agentPaths=( + /etc/quantum/l3_agent.ini \ + /etc/quantum/lbaas_agent.ini \ + /etc/quantum/dhcp_agent.ini \ + /etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini \ + /etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini \ + /etc/quantum/metadata_agent.ini \ +) + +for i in ${!agents[@]} ; do + install -D -m 755 %{SOURCE4} %{buildroot}%{_initddir}/%{name}-${agents[$i]} + sed -i -e "s,__NAME__,${agents[$i]},g" %{buildroot}%{_initddir}/%{name}-${agents[$i]} + if [ ! -z ${agentPaths[$i]} ] ; then + sed -i -e "s,__PLUGIN_CONFFILE__,${agentPaths[$i]},g" %{buildroot}%{_initddir}/%{name}-${agents[$i]} + else + sed -i -e "s,__PLUGIN_CONFFILE__,,g" %{buildroot}%{_initddir}/%{name}-${agents[$i]} + fi + ln -s ../..%{_initddir}/%{name}-${agents[$i]} %{buildroot}%{_sbindir}/rc%{name}-${agents[$i]} +done + +### sudoers configuration for nova-rootwrap: +install -D -m 440 %{SOURCE3} %{buildroot}%{_sysconfdir}/sudoers.d/openstack-quantum + ### documentation -rm -rf doc/build/html/{.buildinfo,.doctrees} -%fdupes -s doc/build/html/ install -d %{buildroot}%{_mandir}/man1 install -m 644 doc/build/man/*.1 %{buildroot}%{_mandir}/man1 +## SUSE configuration defaults +openstack-config --set %{buildroot}/etc/quantum/quantum.conf DEFAULT core_plugin quantum.plugins.linuxbridge.lb_quantum_plugin.LinuxBridgePluginV2 +openstack-config --set %{buildroot}/etc/quantum/quantum.conf DEFAULT root_helper "sudo quantum-rootwrap /etc/quantum/rootwrap.conf" +openstack-config --set %{buildroot}/etc/quantum/quantum.conf DEFAULT log_dir /var/log/quantum + ### test subpackage %openstack_test_package_install %fdupes %{buildroot}%{_localstatedir}/lib/%{name}-test @@ -166,7 +304,6 @@ for i in quantum/tests/unit/nicira/etc/* \ quantum/tests/etc/rootwrap.d/quantum.test.filters \ quantum/tests/etc/api-paste.ini.test \ - quantum/plugins/cisco/tests/unit/v2/ucs/fake_ucs_inventory.ini \ quantum/plugins/cisco/tests/unit/v2/api-paste.ini.cisco.test \ quantum/plugins/cisco/tests/unit/v2/quantumv2.conf.cisco.test \ quantum/plugins/cisco/tests/unit/quantum.conf.cisco.test \ @@ -177,71 +314,156 @@ 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} %pre getent group %{groupname} > /dev/null || groupadd -r %{groupname} -getent passwd %{username} > /dev/null || \ - useradd -r -g %{groupname} -d %{_localstatedir}/lib/nova -s /sbin/nologin \ - -c "Openstack Quantum Daemons" %{username} +getent passwd %{username} > /dev/null || useradd -r -g %{groupname} -d %{_localstatedir}/lib/nova -s /sbin/nologin -c "Openstack Quantum Daemons" %{username} exit 0 -%post +%post server %{fillup_and_insserv -f openstack-quantum} -%preun +%preun server %stop_on_removal openstack-quantum -%postun +%postun server %restart_on_update openstack-quantum %insserv_cleanup +%post +%{fillup_only -n quantum} + %files %defattr(-,root,root,-) %doc LICENSE README %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} +%config %{_sysconfdir}/sudoers.d/openstack-quantum %dir %{_sysconfdir}/quantum %config(noreplace) %{_sysconfdir}/quantum/api-paste.ini -%config(noreplace) %{_sysconfdir}/quantum/dhcp_agent.ini -%config(noreplace) %{_sysconfdir}/quantum/l3_agent.ini +%config %{_sysconfdir}/quantum/policy.json +%config(noreplace) %{_sysconfdir}/quantum/quantum.conf +%config %{_sysconfdir}/quantum/rootwrap.conf +%dir %{_sysconfdir}/quantum/rootwrap.d/ +%ghost %dir %attr(0755, %{username}, root) %{_localstatedir}/run/quantum +%dir %attr(0755, %{username}, root) %{_localstatedir}/lib/quantum +%dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/log/quantum %dir %{_sysconfdir}/quantum/plugins +%dir %{_sysconfdir}/quantum/plugins/bigswitch/ +%dir %{_sysconfdir}/quantum/plugins/brocade/ %dir %{_sysconfdir}/quantum/plugins/cisco/ -%dir %{_sysconfdir}/quantum/plugins/linuxbridge/ +%dir %{_sysconfdir}/quantum/plugins/hyperv/ %dir %{_sysconfdir}/quantum/plugins/metaplugin/ +%dir %{_sysconfdir}/quantum/plugins/midonet %dir %{_sysconfdir}/quantum/plugins/nec/ %dir %{_sysconfdir}/quantum/plugins/nicira/ -%dir %{_sysconfdir}/quantum/plugins/openvswitch/ +%dir %{_sysconfdir}/quantum/plugins/plumgrid/ %dir %{_sysconfdir}/quantum/plugins/ryu/ -%config(noreplace) %{_sysconfdir}/quantum/policy.json -%config(noreplace) %{_sysconfdir}/quantum/quantum.conf -%config(noreplace) %{_sysconfdir}/quantum/plugins/*/*.ini -%config(noreplace) %{_sysconfdir}/quantum/rootwrap.conf -%dir %{_sysconfdir}/quantum/rootwrap.d/ -%config(noreplace) %{_sysconfdir}/quantum/rootwrap.d/dhcp.filters -%config(noreplace) %{_sysconfdir}/quantum/rootwrap.d/iptables-firewall.filters -%config(noreplace) %{_sysconfdir}/quantum/rootwrap.d/l3.filters -%config(noreplace) %{_sysconfdir}/quantum/rootwrap.d/linuxbridge-plugin.filters -%config(noreplace) %{_sysconfdir}/quantum/rootwrap.d/nec-plugin.filters -%config(noreplace) %{_sysconfdir}/quantum/rootwrap.d/openvswitch-plugin.filters -%config(noreplace) %{_sysconfdir}/quantum/rootwrap.d/ryu-plugin.filters -%ghost %dir %attr(0755, %{username}, root) %{_localstatedir}/run/quantum -%dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/log/quantum -%{_initddir}/openstack-quantum -%{_sbindir}/rcopenstack-quantum +%config(noreplace) %{_sysconfdir}/quantum/plugins/bigswitch/restproxy.ini +%config(noreplace) %{_sysconfdir}/quantum/plugins/cisco/cisco_plugins.ini +%config(noreplace) %{_sysconfdir}/quantum/plugins/cisco/credentials.ini +%config(noreplace) %{_sysconfdir}/quantum/plugins/cisco/db_conn.ini +%config(noreplace) %{_sysconfdir}/quantum/plugins/cisco/l2network_plugin.ini +%config(noreplace) %{_sysconfdir}/quantum/plugins/cisco/nexus.ini +%config(noreplace) %{_sysconfdir}/quantum/plugins/hyperv/hyperv_quantum_plugin.ini +%config(noreplace) %{_sysconfdir}/quantum/plugins/linuxbridge/linuxbridge_conf.ini +%config(noreplace) %{_sysconfdir}/quantum/plugins/metaplugin/metaplugin.ini +%config(noreplace) %{_sysconfdir}/quantum/plugins/midonet/midonet.ini +%config(noreplace) %{_sysconfdir}/quantum/plugins/nec/nec.ini +%config(noreplace) %{_sysconfdir}/quantum/plugins/nicira/nvp.ini +%config(noreplace) %{_sysconfdir}/quantum/plugins/brocade/brocade.ini +%config(noreplace) %{_sysconfdir}/quantum/plugins/plumgrid/plumgrid.ini +%config(noreplace) %{_sysconfdir}/quantum/plugins/openvswitch/ovs_quantum_plugin.ini +%config(noreplace) %{_sysconfdir}/quantum/plugins/ryu/ryu.ini +%config %{_sysconfdir}/quantum/rootwrap.d/iptables-firewall.filters %{_bindir}/quantum-debug +%{_bindir}/quantum-check-nvp-config +%{_bindir}/quantum-netns-cleanup +%{_bindir}/quantum-ns-metadata-proxy +%{_bindir}/quantum-rootwrap +%{_mandir}/man1/quantum-server.1%{?ext_man} +/var/adm/fillup-templates/sysconfig.quantum + +%files dhcp-agent +%defattr(-,root,root,-) +%doc LICENSE %{_bindir}/quantum-dhcp-agent %{_bindir}/quantum-dhcp-agent-dnsmasq-lease-update +%{_initddir}/openstack-quantum-dhcp-agent +%{_sbindir}/rcopenstack-quantum-dhcp-agent +%config(noreplace) %{_sysconfdir}/quantum/dhcp_agent.ini +%config %{_sysconfdir}/quantum/rootwrap.d/dhcp.filters + +%files l3-agent +%defattr(-,root,root,-) +%doc LICENSE %{_bindir}/quantum-l3-agent -%{_bindir}/quantum-linuxbridge-agent +%config %{_sysconfdir}/quantum/rootwrap.d/l3.filters +%config(noreplace) %{_sysconfdir}/quantum/l3_agent.ini +%{_initddir}/openstack-quantum-l3-agent +%{_sbindir}/rcopenstack-quantum-l3-agent + +%files lbaas-agent +%defattr(-,root,root,-) +%doc LICENSE +%{_bindir}/quantum-lbaas-agent +%config %{_sysconfdir}/quantum/rootwrap.d/lbaas-haproxy.filters +%config(noreplace) %{_sysconfdir}/quantum/lbaas_agent.ini +%{_initddir}/openstack-quantum-lbaas-agent +%{_sbindir}/rcopenstack-quantum-lbaas-agent + +%files metadata-agent +%defattr(-,root,root,-) +%doc LICENSE +%config(noreplace) %{_sysconfdir}/quantum/metadata_agent.ini +%{_bindir}/quantum-metadata-agent +%{_initddir}/openstack-quantum-metadata-agent +%{_sbindir}/rcopenstack-quantum-metadata-agent + +%files nec-agent +%defattr(-,root,root,-) +%doc LICENSE +%config %{_sysconfdir}/quantum/rootwrap.d/nec-plugin.filters %{_bindir}/quantum-nec-agent -%{_bindir}/quantum-netns-cleanup + +%files ryu-agent +%defattr(-,root,root,-) +%doc LICENSE +%config %{_sysconfdir}/quantum/rootwrap.d/ryu-plugin.filters +%{_bindir}/quantum-ryu-agent + +%files linuxbridge-agent +%defattr(-,root,root,-) +%doc LICENSE +%{_bindir}/quantum-linuxbridge-agent +%config %{_sysconfdir}/quantum/rootwrap.d/linuxbridge-plugin.filters +%dir %{_sysconfdir}/quantum/plugins/linuxbridge/ +%{_initddir}/openstack-quantum-linuxbridge-agent +%{_sbindir}/rcopenstack-quantum-linuxbridge-agent + +%files openvswitch-agent +%defattr(-,root,root,-) +%doc LICENSE +%dir %{_sysconfdir}/quantum/plugins/openvswitch/ %{_bindir}/quantum-openvswitch-agent %{_bindir}/quantum-ovs-cleanup -%{_bindir}/quantum-rootwrap -%{_bindir}/quantum-ryu-agent +%config %{_sysconfdir}/quantum/rootwrap.d/openvswitch-plugin.filters +%{_initddir}/openstack-quantum-openvswitch-agent +%{_sbindir}/rcopenstack-quantum-openvswitch-agent + +%files server +%defattr(-,root,root,-) +%doc LICENSE %{_bindir}/quantum-server -%{_mandir}/man1/quantum-server.1%{?ext_man} +%{_bindir}/quantum-db-manage +%{_initddir}/openstack-quantum +%{_sbindir}/rcopenstack-quantum %files -n python-quantum %defattr(-,root,root,-) @@ -251,10 +473,6 @@ # Part of test subpackage %exclude %{python_sitelib}/%{component}/tests/ -%files doc -%defattr(-,root,root,-) -%doc LICENSE doc/build/html/ - %files test %defattr(-,root,root) %{python_sitelib}/%{component}/tests/ ++++++ 0001-Use-exec_dirs-for-rootwrap-commands.patch ++++++ ++++ 912 lines (skipped) ++++++ 0002-restore-extra-filters.diff ++++++ --- quantum/openstack/common/rootwrap/filters.py +++ quantum/openstack/common/rootwrap/filters.py @@ -178,3 +178,34 @@ if len(userargs) != 2: return False return True + +class IpFilter(CommandFilter): + """Specific filter for the ip utility to that does not match exec.""" + + def match(self, userargs): + if userargs[0] == 'ip': + if userargs[1] == 'netns': + if userargs[2] in ('list', 'add', 'delete'): + return True + else: + return False + else: + return True + +class ExecCommandFilter(CommandFilter): + def exec_args(self, userargs): + return [] + +class IpNetnsExecFilter(ExecCommandFilter): + """Specific filter for the ip utility to that does match exec.""" + def match(self, userargs): + if userargs[:3] == ['ip', 'netns', 'exec']: + return True + else: + return False + + def exec_args(self, userargs): + args = userargs[4:] + if args: + args[0] = os.path.basename(args[0]) + return args ++++++ _service ++++++ --- /var/tmp/diff_new_pack.G8R0Zp/_old 2013-04-24 16:06:47.000000000 +0200 +++ /var/tmp/diff_new_pack.G8R0Zp/_new 2013-04-24 16:06:47.000000000 +0200 @@ -1,6 +1,7 @@ <services> <service name="git_tarballs" mode="disabled"> - <param name="url">http://tarballs.openstack.org/quantum/quantum-stable-folsom.tar.gz</param> - <param name="email">cloud-de...@suse.de</param> + <param name="url">http://tarballs.openstack.org/quantum/quantum-stable-grizzly.tar.gz</param> + <param name="email">opensuse-cl...@opensuse.org</param> + <param name="plain-version">True</param> </service> </services> ++++++ ignore-kombu-version.diff ++++++ Index: quantum.egg-info/requires.txt =================================================================== --- quantum.egg-info/requires.txt.orig +++ quantum.egg-info/requires.txt @@ -1,13 +1,13 @@ Paste PasteDeploy>=1.5.0 Routes>=1.12.3 -amqplib==0.6.1 +amqplib>=0.6.1 anyjson>=0.2.4 eventlet>=0.9.17 greenlet>=0.3.1 httplib2 iso8601>=0.1.4 -kombu==1.0.4 +kombu>=1.0.4 netaddr python-quantumclient>=2.2.0,<3.0.0 pyudev Index: tools/pip-requires =================================================================== --- tools/pip-requires.orig +++ tools/pip-requires @@ -1,14 +1,14 @@ Paste PasteDeploy>=1.5.0 Routes>=1.12.3 -amqplib==0.6.1 +amqplib>=0.6.1 anyjson>=0.2.4 argparse eventlet>=0.9.17 greenlet>=0.3.1 httplib2 iso8601>=0.1.4 -kombu==1.0.4 +kombu>=1.0.4 netaddr python-quantumclient>=2.2.0,<3.0.0 pyudev ++++++ iptables-firewall.filters.patch ++++++ --- a/etc/quantum/rootwrap.d/iptables-firewall.filters 2013-03-14 15:24:09.000000000 +0100 +++ b/etc/quantum/rootwrap.d/iptables-firewall.filters 2013-03-14 15:24:24.000000000 +0100 @@ -10,12 +10,12 @@ # quantum/agent/linux/iptables_manager.py # "iptables-save", ... -iptables-save: CommandFilter, /sbin/iptables-save, root -iptables-restore: CommandFilter, /sbin/iptables-restore, root -ip6tables-save: CommandFilter, /sbin/ip6tables-save, root -ip6tables-restore: CommandFilter, /sbin/ip6tables-restore, root +iptables-save: CommandFilter, /usr/sbin/iptables-save, root +iptables-restore: CommandFilter, /usr/sbin/iptables-restore, root +ip6tables-save: CommandFilter, /usr/sbin/ip6tables-save, root +ip6tables-restore: CommandFilter, /usr/sbin/ip6tables-restore, root # quantum/agent/linux/iptables_manager.py # "iptables", "-A", ... -iptables: CommandFilter, /sbin/iptables, root -ip6tables: CommandFilter, /sbin/ip6tables, root +iptables: CommandFilter, /usr/sbin/iptables, root +ip6tables: CommandFilter, /usr/sbin/ip6tables, root ++++++ openstack-quantum-plugin.init ++++++ #!/bin/bash ### BEGIN INIT INFO # Provides: openstack-quantum-__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-quantum" CONFFILE="/etc/quantum/quantum.conf" RUNDIR="/var/run/quantum" QUANTUM_PLUGIN_CONF="__PLUGIN_CONFFILE__" QUANTUM_PLUGIN_ARGS="" if [ ! -z $QUANTUM_PLUGIN_CONF ] && [ $QUANTUM_PLUGIN_CONF != "" ] ; then PLUGIN_ARGS="$QUANTUM_PLUGIN_ARGS --config-file=$QUANTUM_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 quantum-$DAEMON" /sbin/startproc -q -s -u $USER /usr/bin/quantum-$DAEMON --config-file=$CONFFILE $PLUGIN_ARGS rc_status -v ;; stop) echo -n "Shutting down quantum-$DAEMON" /sbin/killproc /usr/bin/quantum-$DAEMON rc_status -v ;; restart) $0 stop $0 start rc_status ;; force-reload) $0 try-restart rc_status ;; reload) echo -n "Reload service quantum-$DAEMON" rc_failed 3 rc_status -v ;; status) echo -n "Checking for service quantum-$DAEMON" /sbin/checkproc /usr/bin/quantum-$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-quantum.init ++++++ --- /var/tmp/diff_new_pack.G8R0Zp/_old 2013-04-24 16:06:47.000000000 +0200 +++ /var/tmp/diff_new_pack.G8R0Zp/_new 2013-04-24 16:06:47.000000000 +0200 @@ -9,11 +9,14 @@ # Description: Provides the Quantum networking service ### END INIT INFO -PIDFILE=/var/run/quantum/quantum.pid -LOGFILE=/var/log/quantum/quantum.log +QUANTUM_LOGFILE="/var/log/quantum/quantum-server.log" +QUANTUM_SYSCONFIG=/etc/sysconfig/quantum +test -r $QUANTUM_SYSCONFIG || exit 6 +. $QUANTUM_SYSCONFIG +USER="openstack-quantum" DAEMON=/usr/bin/quantum-server -DAEMON_ARGS="--log-file=$LOGFILE" +DAEMON_ARGS="--log-file=$QUANTUM_LOGFILE --config-file=/etc/quantum/quantum.conf --config-file=$QUANTUM_PLUGIN_CONF" DAEMON_DIR=/var/run export TMPDIR=/var/lib/quantum/tmp @@ -26,12 +29,16 @@ case "$1" in start) - echo -n "Starting quantum server" "quantum-server" - startproc -t ${STARTUP_TIMEOUT:-5} -q $DAEMON $DAEMON_ARGS + echo -n "Checking for DB Migrations" + /usr/bin/quantum-db-manage check_migration + rc_status -v + + echo -n "Starting quantum server" + startproc -t ${STARTUP_TIMEOUT:-5} -q -s -u $USER $DAEMON $DAEMON_ARGS rc_status -v ;; stop) - echo -n "Stopping quantum server" "quantum-server" + echo -n "Stopping quantum server" killproc $DAEMON rc_status -v ;; ++++++ openstack-quantum.logrotate ++++++ --- /var/tmp/diff_new_pack.G8R0Zp/_old 2013-04-24 16:06:47.000000000 +0200 +++ /var/tmp/diff_new_pack.G8R0Zp/_new 2013-04-24 16:06:48.000000000 +0200 @@ -1,5 +1,10 @@ /var/log/quantum/*.log { - daily + rotate 15 + size 1M + weekly + dateext missingok + notifempty su openstack-quantum openstack-quantum + sharedscripts } ++++++ quantum-sudoers ++++++ openstack-quantum ALL = (root) NOPASSWD: /usr/bin/quantum-rootwrap /etc/quantum/rootwrap.conf * ++++++ quantum-suse-config-defaults.diff ++++++ diff -urN b/quantum-2013.1/etc/dhcp_agent.ini a/quantum-2013.1/etc/dhcp_agent.ini --- b/quantum-2013.1/etc/dhcp_agent.ini 2013-04-04 17:43:00.000000000 +0200 +++ a/quantum-2013.1/etc/dhcp_agent.ini 2013-04-05 15:35:38.486660941 +0200 @@ -11,12 +11,12 @@ # matches you plugin. # OVS based plugins(OVS, Ryu, NEC, NVP, BigSwitch/Floodlight) -interface_driver = quantum.agent.linux.interface.OVSInterfaceDriver +#interface_driver = quantum.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 = quantum.agent.linux.interface.BridgeInterfaceDriver +interface_driver = quantum.agent.linux.interface.BridgeInterfaceDriver # The agent can use other DHCP drivers. Dnsmasq is the simplest and requires # no additional setup of the DHCP server. diff -urN b/quantum-2013.1/etc/l3_agent.ini a/quantum-2013.1/etc/l3_agent.ini --- b/quantum-2013.1/etc/l3_agent.ini 2013-04-04 17:43:00.000000000 +0200 +++ a/quantum-2013.1/etc/l3_agent.ini 2013-04-05 15:35:22.410659237 +0200 @@ -6,12 +6,12 @@ # matches your plugin. # OVS based plugins (OVS, Ryu, NEC) that supports L3 agent -interface_driver = quantum.agent.linux.interface.OVSInterfaceDriver +#interface_driver = quantum.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 = quantum.agent.linux.interface.BridgeInterfaceDriver +interface_driver = quantum.agent.linux.interface.BridgeInterfaceDriver # Allow overlapping IP (Must have kernel build with CONFIG_NET_NS=y and # iproute2 package that supports namespaces). diff -urN b/quantum-2013.1/etc/quantum.conf a/quantum-2013.1/etc/quantum.conf --- b/quantum-2013.1/etc/quantum.conf 2013-04-04 17:43:05.000000000 +0200 +++ a/quantum-2013.1/etc/quantum.conf 2013-04-05 15:33:54.142669807 +0200 @@ -27,7 +27,7 @@ # use_stderr = True # log_file = -# log_dir = +log_dir = /var/log/quantum # publish_errors = False @@ -45,7 +45,7 @@ # api_extensions_path = # Quantum plugin provider module -# core_plugin = +core_plugin = quantum.plugins.linuxbridge.lb_quantum_plugin.LinuxBridgePluginV2 # Advanced service modules # service_plugins = @@ -253,7 +253,7 @@ # 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 ++++++ quantum-test-default-state-path.patch ++++++ --- quantum/tests/unit/test_config.py +++ quantum/tests/unit/test_config.py @@ -37,10 +37,6 @@ self.assertTrue(cfg.CONF.allow_bulk) self.assertEqual(5, cfg.CONF.max_dns_nameservers) self.assertEqual(20, cfg.CONF.max_subnet_host_routes) - relative_dir = os.path.join(os.path.dirname(__file__), - '..', '..', '..') - absolute_dir = os.path.abspath(relative_dir) - self.assertEqual(absolute_dir, cfg.CONF.state_path) self.assertEqual(120, cfg.CONF.dhcp_lease_duration) self.assertFalse(cfg.CONF.allow_overlapping_ips) self.assertEqual('quantum', cfg.CONF.control_exchange) ++++++ sqlalchemy-update.diff ++++++ commit 72e8daf83f92bea15e99ec09d6ad791fdbca5774 Author: Dirk Mueller <d...@dmllr.de> Date: Tue Mar 12 23:08:27 2013 +0100 Pin SQLAlchemy to 0.7.x 0.7.10 has been released and is compatible with 0.7.x. Instead of pinning to 0.7.9, simply pin to 0.7.x to avoid SQLAlchemy 0.8 Unfortuantely '<0.8' matches '0.8.0b2', which is what we don't want. Therefore pinning it to '<=0.7.99' instead. This matches a corresponding change in openstack/requirements Change-Id: Icf680a933c6092cce52706fd9616a0d208164d1e diff --git a/tools/pip-requires b/tools/pip-requires index fec8b7a..3168c36 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -12,7 +12,7 @@ kombu==1.0.4 netaddr python-quantumclient>=2.2.0,<3.0.0 pyudev -sqlalchemy==0.7.9 +sqlalchemy>=0.7.8,<=0.7.99 WebOb>=1.2 python-keystoneclient>=0.2.0 alembic>=0.4.1 ++++++ sysconfig.quantum ++++++ ## Type: string # # location of the plugin configuration file QUANTUM_PLUGIN_CONF="/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini" -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org