commit openstack-neutron for openSUSE:13.1

Hello community, here is the log from the commit of package openstack-neutron for openSUSE:13.1 checked in at 2013-10-23 11:26:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/openstack-neutron (Old) and /work/SRC/openSUSE:13.1/.openstack-neutron.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openstack-neutron" Changes: -------- --- /work/SRC/openSUSE:13.1/openstack-neutron/openstack-neutron-doc.changes 2013-09-23 11:02:34.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.openstack-neutron.new/openstack-neutron-doc.changes 2013-10-23 11:26:44.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 19 07:09:33 UTC 2013 - berendt@b1-systems.de + +- replacing Quantum with Neutron + +------------------------------------------------------------------- --- /work/SRC/openSUSE:13.1/openstack-neutron/openstack-neutron.changes 2013-09-23 11:02:34.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.openstack-neutron.new/openstack-neutron.changes 2013-10-23 11:26:44.000000000 +0200 @@ -1,0 +2,1024 @@ +Fri Oct 18 20:08:31 UTC 2013 - dmueller@suse.com + +- add 0001-Fix-update_device_up-method-of-linuxbridge-plugin.patch + +------------------------------------------------------------------- +Thu Oct 17 15:59:26 UTC 2013 - dmueller@suse.com + +- update to 2013.2: + + No changes + +------------------------------------------------------------------- +Sat Oct 12 13:31:27 UTC 2013 - speilicke@suse.com + +- Update to version 2013.2.rc2: + + No changes + +------------------------------------------------------------------- +Sat Oct 5 09:34:18 UTC 2013 - opensuse-cloud@opensuse.org + +- Update to version 2013.2.rc1: + + Cisco plugin should check for switch - vlan bindings + + Disable lazy translation + + Imported Translations from Transifex + + Should not add metadata filter rules if disable metadata proxy + + add greenthread.sleep to increase yields + + Updated from global requirements + + create milestone migration for Havana release + +------------------------------------------------------------------- +Wed Oct 2 00:49:20 UTC 2013 - opensuse-cloud@opensuse.org + +- Update to version 2013.2.a780.gb94a602: + + Increase number of concurrent_connections to nvp + +------------------------------------------------------------------- +Tue Oct 1 21:12:13 UTC 2013 - dmueller@suse.com + +- set log to verbose by default +- require dnsmasq-utils on 13.1 or newer + +------------------------------------------------------------------- +Tue Oct 1 00:38:19 UTC 2013 - opensuse-cloud@opensuse.org + +- Update to version 2013.2.a778.g6d089df: + + Fixes Hyper-V agent RPC calls for ML2 support + + Fix auto-deletion of ports and subnets in ML2 + + Add error log for SystemExit in l3-agent + + Add missing migration for fields in Cisco Nexus table + + ML2 Cisco Nexus mech driver portbinding support + + Imported Translations from Transifex + + Ensure that security group agent is bound prior to accessing + + Reverse the order of interface update and DNAT rule config + + Fix to enable delete of firewall in PENDING_CREATE state + + Improve ml2_conf.ini + + Imported Translations from Transifex + +------------------------------------------------------------------- +Sun Sep 29 00:36:48 UTC 2013 - opensuse-cloud@opensuse.org + +- Update to version 2013.2.a757.g5527e76: + + Add host routes and dns nameservers to Midonet DHCP + + Fix adding identical metering rules on two labels + + Pythonic method names for l3_agent unit tests + + Imported Translations from Transifex + +------------------------------------------------------------------- +Sat Sep 28 00:31:59 UTC 2013 - opensuse-cloud@opensuse.org + +- Update to version 2013.2.a750.g4f14217: + + Sync rootwrap with code from oslo + + Ensure router exists when auto_schedule_routers + + Add an option for always synchronizing status + + Allowed Address Pairs support in NEC plugin + + Send proper exception info as expected by the neutron client + + Redefine behavior for NvpAdvancedPlugin during network creation + + Raise an exception if no router_id provided + +------------------------------------------------------------------- +Fri Sep 27 16:30:53 UTC 2013 - dmueller@suse.com + +- switch to crudini + +------------------------------------------------------------------- +Fri Sep 27 00:36:42 UTC 2013 - opensuse-cloud@opensuse.org + +- Update to version 2013.2.a736.gbf7a895: + + Imported Translations from Transifex + + Allow sharing of firewall rules and policies in policy.json + +------------------------------------------------------------------- +Thu Sep 26 13:03:36 UTC 2013 - opensuse-cloud@opensuse.org + +- Update to version 2013.2.a732.gae56b4e: + + Ensure nullable=False for netid in packetfilters table + +------------------------------------------------------------------- +Thu Sep 26 10:14:55 UTC 2013 - opensuse-cloud@opensuse.org + +- Update to version 2013.2.a730.g0836aab: + + Properly synchronize status for ports deleted from backend + + Port Cisco nexus subplugin UT to ML2 mech driver UT + + Require oslo.config 1.2.0 final + + Fix FWaaS plugin to allow one firewall per tenant + + Imported Translations from Transifex + + add portbinding host into vip port + + Remove code that bypasses some midonet plugin unit tests + + Fix port deletion in NEC Plugin + + Sync gettextutils from oslo + + Change hard coded numbers to constants in security group tests + +------------------------------------------------------------------- +Wed Sep 25 00:03:15 UTC 2013 - opensuse-cloud@opensuse.org + +- Update to version 2013.2.a711.g81f69ca: + + LBaaS: include inactive members when retrieving logical config + + Apply VPN migration to correct plugin + + Neutron network delete fails with brocade plugin + + Imported Translations from Transifex + +------------------------------------------------------------------- +Tue Sep 24 00:08:39 UTC 2013 - opensuse-cloud@opensuse.org + +- Update to version 2013.2.a703.g868fcea: + + Handle long integer conversion in NEC portinfo validation tests + + Use built-in print() instead of print statement + + Flip to pythonic method names for context unit tests + + Imported Translations from Transifex + + Fix usage of _fields method in provider_configuration.py + + Ensure names are truncated to accommodate NVP limit + + Port Cisco nexus and network db UT to ML2 mech driver UT + + Fix for status always in PENDING_CREATE for Edge service router + +------------------------------------------------------------------- +Sun Sep 22 23:35:55 UTC 2013 - opensuse-cloud@opensuse.org + +- Update to version 2013.2.a687.g4fa69a1: + + Imported Translations from Transifex + +------------------------------------------------------------------- +Sun Sep 22 00:25:31 UTC 2013 - opensuse-cloud@opensuse.org + +- Update to version 2013.2.a686.gd000a92: + + Imported Translations from Transifex + + Remove ununsed method update_providers + + Fix URL used in NCS mechanism driver sync_full() operation + + NVP plugin: Set default max_lp_per_bridged_ls to 5000 + +------------------------------------------------------------------- +Sat Sep 21 00:45:15 UTC 2013 - opensuse-cloud@opensuse.org + +- Update to version 2013.2.a679.g76112fe: + + Imported Translations from Transifex + + Allow non-admin user to list service providers + +------------------------------------------------------------------- +Fri Sep 20 00:24:18 UTC 2013 - opensuse-cloud@opensuse.org + +- Update to version 2013.2.a676.g177bfb0: + + Imported Translations from Transifex + + Fix bridge logical chaining + + FWaaS - fix reordering of rules in policy + + Sync gettextutils from oslo + + Cisco plugin portbinding extension support + + Change header from LLC to Foundation + + Fix ovs-vsctl call in add_tunnel_port() + + Fix handling of floating IP association info in Nicira plugin + + Do not apply security groups to logical ports + + Change daemon Pidfile class to not use root_helper + +------------------------------------------------------------------- +Wed Sep 18 23:38:21 UTC 2013 - opensuse-cloud@opensuse.org + +- Update to version 2013.2.a657.g289d353: + + Support for NVP advanced FwaaS service + + Support advanced NVP LBaaS Service + + BigSwitch plugin: passes context to all update_network calls + + Fixing two comments regarding bind_port in ml2 + + Prevent update_port ip_address from matching address_pair + + Port binding registration with NeutronDbPlugin causes Neutron crash + + Imported Translations from Transifex + + Make router-interface-delete work in N1kv plugin + + BigSwitch plugin: allow 'external' keyword in router rules + + Dynamically adjust max number of leases + + Fix KeyError for NVP plugin during portbinding update + +------------------------------------------------------------------- +Tue Sep 17 23:52:55 UTC 2013 - opensuse-cloud@opensuse.org + +- Update to version 2013.2.a636.g6aa2312: + + Fix failure in multi-chunk state sync for nicira plugin + + Fixes hyperv neutron agent test, and removes exit + + Imported Translations from Transifex + + Increase size of peer_address attribute in VPNaaS + + Fix error raised when router-interface-delete on no-snat routers + +------------------------------------------------------------------- +Mon Sep 16 23:48:37 UTC 2013 - opensuse-cloud@opensuse.org ++++ 827 more lines (skipped) ++++ between /work/SRC/openSUSE:13.1/openstack-neutron/openstack-neutron.changes ++++ and /work/SRC/openSUSE:13.1/.openstack-neutron.new/openstack-neutron.changes Old: ---- 0001-Be-compatible-with-oslo.config-master.patch neutron-master.tar.gz neutron-suse-config-defaults.diff New: ---- 0001-Fix-update_device_up-method-of-linuxbridge-plugin.patch neutron-2013.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-neutron-doc.spec ++++++ --- /var/tmp/diff_new_pack.q80OXe/_old 2013-10-23 11:26:44.000000000 +0200 +++ /var/tmp/diff_new_pack.q80OXe/_new 2013-10-23 11:26:44.000000000 +0200 @@ -19,13 +19,13 @@ %define component neutron Name: openstack-neutron-doc -Version: 2013.2.a914.gd80048e +Version: 2013.2 Release: 0 -Summary: OpenStack Virtual Network Service (Quantum) - Documentation +Summary: OpenStack Virtual Network Service (Neutron) - Documentation License: Apache-2.0 Group: Documentation/HTML Url: https://launchpad.net/neutron -Source: neutron-master.tar.gz +Source: neutron-2013.2.tar.gz BuildRequires: openstack-suse-macros BuildRequires: python-Paste BuildRequires: python-PasteDeploy @@ -54,17 +54,17 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Quantum is a virtual network service for Openstack. +Neutron is a virtual network service for Openstack. This package contains documentation files for openstack-%{component} %prep -%setup -q -n neutron-2013.2.a914.gd80048e +%setup -q -n neutron-2013.2 %openstack_cleanup_prep %build python setup.py build_sphinx -rm -rf doc/build/html/.buildinfo # Remove unneeded files +rm doc/build/html/.buildinfo # Remove unneeded files %install ++++++ openstack-neutron.spec ++++++ --- /var/tmp/diff_new_pack.q80OXe/_old 2013-10-23 11:26:44.000000000 +0200 +++ /var/tmp/diff_new_pack.q80OXe/_new 2013-10-23 11:26:44.000000000 +0200 @@ -21,45 +21,36 @@ %define username openstack-%{component} Name: openstack-neutron -Version: 2013.2.a914.gd80048e +Version: 2013.2 Release: 0 Summary: OpenStack Network License: Apache-2.0 Group: System/Management Url: https://launchpad.net/neutron -Source: neutron-master.tar.gz +Source: neutron-2013.2.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 +Patch0: 0001-Fix-update_device_up-method-of-linuxbridge-plugin.patch +BuildRequires: crudini 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 +BuildRequires: python-setuptools # 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 +Requires: python-oslo.config >= 1.2.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()")} @@ -83,28 +74,31 @@ Summary: OpenStack Network - Python module Group: Development/Languages/Python Requires: python >= 2.6.8 +Requires: python-Jinja2 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-WebOb >= 1.2.3 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-anyjson >= 0.3.3 +Requires: python-eventlet >= 0.13.0 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-jsonrpclib +Requires: python-keystoneclient >= 0.3.2 +Requires: python-kombu >= 2.4.8 Requires: python-netaddr -Requires: python-neutronclient >= 2.2.3 -Requires: python-novaclient -Requires: python-pbr >= 0.5.16 +Requires: python-neutronclient >= 2.3.0 +Requires: python-novaclient >= 2.15.0 +Requires: python-oslo.config >= 1.2.0 +Requires: python-pbr >= 0.5.21 Requires: python-pyudev +Requires: python-requests >= 1.1 Requires: python-six -Requires: python-stevedore >= 0.9 +Requires: python-stevedore >= 0.10 Provides: python-quantum = 2013.2.0 Obsoletes: python-quantum < 2013.2.0 @@ -115,6 +109,7 @@ Summary: OpenStack Network - Python module Group: Development/Languages/Python PreReq: %name = %version +Requires: python-Babel >= 0.9.6 Provides: openstack-quantum-server = 2013.2.0 Obsoletes: openstack-quantum-server < 2013.2.0 @@ -126,6 +121,9 @@ Group: Development/Languages/Python PreReq: %name = %version Requires: dnsmasq +%if 0%{?suse_version} >= 1310 +Requires: dnsmasq-utils +%endif Provides: openstack-quantum-dhcp-agent = 2013.2.0 Obsoletes: openstack-quantum-dhcp-agent < 2013.2.0 @@ -184,6 +182,14 @@ %description metadata-agent This package provides the Meta Data Agent. +%package metering-agent +Summary: OpenStack Network - Metering Agent +Group: Development/Languages/Python +PreReq: %name = %version + +%description metering-agent +This package provides the Metering Agent. + %package mlnx-agent Summary: OpenStack Network - Mellanox Plugin Group: Development/Languages/Python @@ -228,33 +234,49 @@ %description openvswitch-agent This package provides the OpenVSwitch Agent. +%package vpn-agent +Summary: OpenStack Network - VPN Agent +Group: Development/Languages/Python +PreReq: %name = %version + +%description vpn-agent +This package provides the VPN Agent. + +%package plugin-cisco +Summary: OpenStack Network - Cisco Plugin (openvswitch based) +Group: Development/Languages/Python +Provides: openstack-neuton-plugin-cisco = %version +PreReq: %name = %version +PreReq: %name-server = %version +Requires: openvswitch +Requires: python >= 2.6.8 +Requires: python-configobj +Requires: python-ncclient + +%description plugin-cisco +This package provides cisco plugin for OpenStack Network server. %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-WebTest >= 2.0 +Requires: python-cliff >= 1.4.3 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-fixtures >= 0.3.14 Requires: python-flake8 >= 2.0 -Requires: python-hacking >= 0.5.3 -Requires: python-mock >= 1.0b1 +Requires: python-hacking >= 0.5.6 +Requires: python-mock >= 1.0 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 +Requires: python-testrepository >= 0.0.17 +Requires: python-testtools >= 0.9.32 Provides: openstack-quantum-test = 2013.2.0 Obsoletes: openstack-quantum-test < 2013.2.0 @@ -263,11 +285,10 @@ of OpenStack Neutron. %prep -%setup -q -n neutron-2013.2.a914.gd80048e +%setup -q -n neutron-2013.2 +%patch0 -p1 ## comment me in # %xopenstack_cleanup_prep -%patch2 -%patch3 -p1 %build python setup.py build @@ -299,7 +320,9 @@ openvswitch-agent \ linuxbridge-agent \ metadata-agent \ + metering-agent \ mlnx-agent \ + vpn-agent \ ) agentPaths=( /etc/%{component}/l3_agent.ini \ @@ -309,7 +332,9 @@ /etc/%{component}/plugins/openvswitch/ovs_neutron_plugin.ini \ /etc/%{component}/plugins/linuxbridge/linuxbridge_conf.ini \ /etc/%{component}/metadata_agent.ini \ + /etc/%{component}/metering_agent.ini \ /etc/%{component}/plugins/mlnx-agent.ini \ + /etc/%{component}/vpn_agent.ini \ ) for i in ${!agents[@]} ; do @@ -331,10 +356,13 @@ 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 "" +crudini --set %{buildroot}/etc/neutron/neutron.conf DEFAULT verbose True +crudini --set %{buildroot}/etc/neutron/neutron.conf DEFAULT core_plugin neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2 +crudini --set %{buildroot}/etc/neutron/neutron.conf agent root_helper "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" +crudini --set %{buildroot}/etc/neutron/neutron.conf DEFAULT log_dir /var/log/neutron +crudini --set %{buildroot}/etc/neutron/dhcp_agent.ini DEFAULT interface_driver neutron.agent.linux.interface.BridgeInterfaceDriver +crudini --set %{buildroot}/etc/neutron/l3_agent.ini DEFAULT external_network_bridge "br-ex" +crudini --set %{buildroot}/etc/neutron/l3_agent.ini DEFAULT interface_driver neutron.agent.linux.interface.BridgeInterfaceDriver ### test subpackage %openstack_test_package_install @@ -346,7 +374,7 @@ 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 + install -m 0644 -D $i %{buildroot}%{python_sitelib}/$i done ### sysconfig @@ -356,6 +384,7 @@ ### misc %fdupes %{buildroot}%{python_sitelib}/%{component} +%fdupes %{buildroot}%{_bindir} ### authentication cache dir mkdir -p %{buildroot}%{_localstatedir}/cache/%{component} @@ -396,7 +425,6 @@ %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 @@ -406,12 +434,13 @@ %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/ml2/ml2_conf_arista.ini +%config(noreplace) %{_sysconfdir}/%{component}/plugins/ml2/ml2_conf_cisco.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 @@ -429,6 +458,10 @@ %{_bindir}/quantum-ns-metadata-proxy %{_bindir}/%{component}-rootwrap %{_bindir}/quantum-rootwrap +%{_bindir}/%{component}-rootwrap-xen-dom0 +%{_bindir}/quantum-rootwrap-xen-dom0 +%{_bindir}/%{component}-usage-audit +%{_bindir}/quantum-usage-audit %{_mandir}/man1/%{component}-server.1%{?ext_man} /var/adm/fillup-templates/sysconfig.neutron @@ -437,8 +470,6 @@ %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 @@ -482,6 +513,14 @@ %{_initddir}/openstack-%{component}-metadata-agent %{_sbindir}/rcopenstack-%{component}-metadata-agent +%files metering-agent +%defattr(-,root,root,-) +%doc LICENSE +%config(noreplace) %{_sysconfdir}/%{component}/metering_agent.ini +%{_bindir}/%{component}-metering-agent +%{_initddir}/openstack-%{component}-metering-agent +%{_sbindir}/rcopenstack-%{component}-metering-agent + %files mlnx-agent %defattr(-,root,root,-) %doc LICENSE @@ -528,6 +567,14 @@ %{_initddir}/openstack-%{component}-openvswitch-agent %{_sbindir}/rcopenstack-%{component}-openvswitch-agent +%files vpn-agent +%defattr(-,root,root,-) +%doc LICENSE +%config(noreplace) %{_sysconfdir}/%{component}/vpn_agent.ini +%{_bindir}/%{component}-vpn-agent +%{_initddir}/openstack-%{component}-vpn-agent +%{_sbindir}/rcopenstack-%{component}-vpn-agent + %files server %defattr(-,root,root,-) %doc LICENSE @@ -547,6 +594,11 @@ # Part of test subpackage %exclude %{python_sitelib}/%{component}/tests/ +%files plugin-cisco +%defattr(-,root,root) +%dir %{_sysconfdir}/%{component}/plugins/cisco/ +%config(noreplace) %{_sysconfdir}/%{component}/plugins/cisco/cisco_plugins.ini + %files test %defattr(-,root,root) %{python_sitelib}/%{component}/tests/ ++++++ 0001-Fix-update_device_up-method-of-linuxbridge-plugin.patch ++++++

From 11746bbd7b02039ef1b63b3eaafbbdb603e09b52 Mon Sep 17 00:00:00 2001 From: Eugene Nikanorov Date: Fri, 18 Oct 2013 17:23:01 +0400 Subject: [PATCH] Fix update_device_up method of linuxbridge plugin

Change-Id: I97f2f9249b684aa5350b3f0621754543e80bec70 Closes-Bug: #1241602 --- neutron/plugins/linuxbridge/lb_neutron_plugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neutron/plugins/linuxbridge/lb_neutron_plugin.py b/neutron/plugins/linuxbridge/lb_neutron_plugin.py index 1920d0e..68bfd41 100644 --- a/neutron/plugins/linuxbridge/lb_neutron_plugin.py +++ b/neutron/plugins/linuxbridge/lb_neutron_plugin.py @@ -144,7 +144,7 @@ class LinuxBridgeRpcCallbacks(dhcp_rpc_base.DhcpRpcCallbackMixin, agent_id = kwargs.get('agent_id') device = kwargs.get('device') host = kwargs.get('host') - port = self.get_port_from_device.get_port(device) + port = self.get_port_from_device(device) LOG.debug(_("Device %(device)s up on %(agent_id)s"), {'device': device, 'agent_id': agent_id}) plugin = manager.NeutronManager.get_plugin() -- 1.8.4 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.q80OXe/_old 2013-10-23 11:26:44.000000000 +0200 +++ /var/tmp/diff_new_pack.q80OXe/_new 2013-10-23 11:26:44.000000000 +0200 @@ -1,6 +1,6 @@ <services> <service name="git_tarballs" mode="disabled"> - <param name="url">http://tarballs.openstack.org/neutron/neutron-master.tar.gz</param> + <param name="url">http://tarballs.openstack.org/neutron/neutron-2013.2.tar.gz</param> <param name="email">opensuse-cloud@opensuse.org</param> <param name="plain-version">True</param> </service> ++++++ neutron-master.tar.gz -> neutron-2013.2.tar.gz ++++++ ++++ 776142 lines of diff (skipped) ++++++ neutron-sudoers ++++++ --- /var/tmp/diff_new_pack.q80OXe/_old 2013-10-23 11:26:46.000000000 +0200 +++ /var/tmp/diff_new_pack.q80OXe/_new 2013-10-23 11:26:46.000000000 +0200 @@ -1 +1,2 @@ -openstack-quantum ALL = (root) NOPASSWD: /usr/bin/quantum-rootwrap /etc/quantum/rootwrap.conf * +Defaults:openstack-neutron !syslog +openstack-neutron ALL = (root) NOPASSWD: /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf * ++++++ sysconfig.neutron ++++++ --- /var/tmp/diff_new_pack.q80OXe/_old 2013-10-23 11:26:46.000000000 +0200 +++ /var/tmp/diff_new_pack.q80OXe/_new 2013-10-23 11:26:46.000000000 +0200 @@ -2,4 +2,4 @@ # # location of the plugin configuration file -QUANTUM_PLUGIN_CONF="/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini" +NEUTRON_PLUGIN_CONF="/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org