Hello community,
here is the log from the commit of package openstack-nova for openSUSE:Factory
checked in at 2013-09-16 12:38:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openstack-nova (Old)
and /work/SRC/openSUSE:Factory/.openstack-nova.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-nova"
Changes:
--------
--- /work/SRC/openSUSE:Factory/openstack-nova/openstack-nova.changes
2013-08-05 20:49:24.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.openstack-nova.new/openstack-nova.changes
2013-09-16 12:38:01.000000000 +0200
@@ -0,0 +1,562 @@
+-------------------------------------------------------------------
+Tue Sep 3 23:40:10 UTC 2013 - opensuse-cl...@opensuse.org
+
+- Update to version 2013.2.a3318.g79ef562+git.1378251610.79ef562:
+ + Improves Hyper-V vmutils module for subclassing
+ + Adds 'instance_type' param to build_request_spec
+ + Check ephemeral and swap size in the API
+ + Add os-block-device-mapping to v3 API
+ + Scheduler rpcapi 2.9 is not backwards compatible
+ + Add scheduler support for PCI passthrough
+ + Adds support for Hyper-V WMI V2 namespace
+ + Make compute_api use Service and ComputeNode objects
+ + compute rpcapi 2.29 is not backwards compatible
+ + xenapi: add support for auto_disk_config=disabled
+ + On snapshot errors delete the image
+ + Introduce AuthFailure EC2 error code
+ + Introduce IncorrectState EC2 error code
+ + Introduce SecurityGroupLimitExceeded EC2 error code
+ + Introduce UnsupportedOperation EC2 error code
+ + Introduce InternalError EC2 error code
+ + Remove EC2 postfix from InvalidInstanceIDMalformedEC2
+ + Add dict and list utility functions for object typing
+ + Add Aggregate object model
+ + VMware: remove conditional suds validation
+
+-------------------------------------------------------------------
+Mon Sep 2 23:37:25 UTC 2013 - opensuse-cl...@opensuse.org
+
+- Update to version 2013.2.a3279.g8b5f0c9+git.1378165045.8b5f0c9:
+ + Adds API version discovery support for V3
+ + Delete expired instance console auth tokens
+ + Fix unicode key of azcache can't be stored to memcache
+ + Add an exception when doesn't have permissions to operate vm on hyper-v
+ + Don't inject files while resizing instance
+ + Clean destroy for project quota
+ + Fix FK violation in ConsoleTestCase
+ + Port flavormanage extension to v3 API part 1
+ + Fix VMware fakes
+ + Added new hypervisor to support Docker containers
+ + handle auto assigned flag on allocate floating ip
+ + Remove unused fake run_instance() method
+ + Add flag to make IsolatedHostsFilter less restrictive
+ + DRY up use of @wrap_exception() decorator
+ + Adds V3 API samples for migrations
+
+-------------------------------------------------------------------
+Mon Sep 2 14:05:11 UTC 2013 - dmuel...@suse.com
+
+- also install v3 api_samples
+
+-------------------------------------------------------------------
+Mon Sep 2 08:04:13 UTC 2013 - dmuel...@suse.com
+
+- Update to version 2013.2.a3249.g7c9e6a8+git.1378109053.7c9e6a8:
+ + Adds V3 API samples for agents, aggregates and certificates
+ + VMware: Config Drive Support
+ + Fix warning log message typo in resource_tracker.instance_claim
+ + Fix wrong method call in baremetal
+ + Fix one port can be attached to more devices
+ + xenapi: skip metadata updates when VM not found
+ + powervm: actually remove files after migration
+ + Fixes missing host in Hyper-V get_volume_connector
+ + Call safe_encode() instead of str()
+ + compute rpcapi 2.37 is not backwards compatible
+ + Use ExceptionHelper to bypass @client_exceptions
+ + Add block_device_mapping_get_all_by_instance to virtapi
+ + Introduce InvalidPermission.Duplicate EC2 error code
+ + Sync rpc from oslo-incubator
+ + Remove dis/associate actions from security_groups v3
+ + Improve db_sqlalchemy_api test coverage
+ + Tenant id filter test is not correct
+ + Disable retry filter with force_hosts or force_nodes
+ + VMware: use VM uuid for volume attach and detach
+ + xenapi: Improve test_xenapi unit testing performance
+ + Fix network creation in Vlan mode
+ + baremetal: Log IPMI power on/off timeouts
+ + Disconnect from iSCSI volume sessions after live migration
+ + emit warning while running flake8 without virtual env
+ + Add alias as prefix to request params for user_data v3
+ + Correct default ratelimits for v3
+ + Fix V3 API quota_set tests using V3 url and request
+
+-------------------------------------------------------------------
+Sat Aug 31 00:16:54 UTC 2013 - opensuse-cl...@opensuse.org
+
+- Update to version 2013.2.a3195.g04eee47+git.1377908214.04eee47:
+ + Fix usage of classmethod in various places
+ + xenapi: agent not inject ssh-key if cloud-init
+ + XenAPI: Generic Fake.get_all_records_where implementation
+ + XenAPI: SR location should default to location stored in PBD
+ + Fix and gate on H302 (import only modules)
+ + XenAPI: make_partition fixes for Dom0
+ + XenAPI: More operations with LVM-based SRs
+ + Make compute_capabilities_filter use information from DB not RPC
+ + Make image_props_filter use information from DB not RPC
+ + Disable compute fanout to scheduler
+ + Unimplemented suspend/resume should not change vm state
+ + Make resource_tracker record host_ip
+ + Adds Instance UUID to rsync debug logging
+ + PCI devices resource tracker
+ + Add PCI device tracker to compute resource tracker
+
+-------------------------------------------------------------------
+Fri Aug 30 14:57:16 UTC 2013 - opensuse-cl...@opensuse.org
+
+- Update to version 2013.2.a3165.gdd839df+git.1377874636.dd839df:
+ + powervm: Use FixedIntervalLoopingCall for polling LPAR status
+ + powervm: revert driver to pass for plug_vifs
+ + powervm: make start_lpar timeout
+
+-------------------------------------------------------------------
+Thu Aug 29 23:35:24 UTC 2013 - bwiedem...@suse.com
+
+- drop obsolete websockify-05.diff
+- Update to version 2013.2.a3159.gced24c9+git.1377819324.ced24c9:
+ + Adds missing V3 API scheduler hints testcase
+ + Pass the destination file name to download modules
+ + Fix migrations index
+ + Enable no_parent and file_only security
+ + libvirt: allow passing 'os_type' property to glance
+ + Libvirt: fix KeyError in set_vif_bandwidth_config
+ + Remove deprecated legacy network info model in Hypervisor drivers
+ + Removes V3 API images and image_metadata extensions
+ + EC2-API: Fix ambiguous ipAddress/dnsName issue
+ + VMware: provide a coherent message to user when viewing console log
+ + Stylistic improvement of compute.api.API.update()
+ + Move live-migration control flow from scheduler to conductor
+ + Make nbd reservation thread-safe
+ + Pci Device DB support
+ + Add PCI device object support
+ + Fix v3 extensions inherit from wrong controller
+ + Link Service.compute_node with ComputeNode object
+ + Imported Translations from Transifex
+ + use 'exc_info=True' instead of import traceback
+ + Update availability_zone on time if it was changed
+ + VMware: remove redundant default=None for config options
+ + Remove unused nova.common module
+ + Make xenapi capabilities['enabled'] use service enabled
+ + Add PCI stats
+ + PCI alias support
+ + Add env to make_subprocess
+ + Fix Instance object issues
+ + fix volume swap exception cases
+ + Add DocStrings for function allocate_for_instance
+ + Object support for instance groups
+ + Fix untranslated log messages in libvirt driver
+ + Raises masked AssertionError in _test_network_api
+ + Port multiple_create extension to V3 API
+ + Improve parameter related EC2 error codes
+ + Don't need to init testr in run_tests.sh
+ + Added qemu guest agent support for qemu/kvm
+ + Fix race when running initialize_gateway_device()
+ + Fix typo in baremetal docs
+ + Store CONF.baremetal.instance_type_extra_specs in DB
+ + Make compute_api migrate/resize paths use instance objects
+ + Make compute_api confirm/revert resize use objects
+ + Mock out action event calls in build instance test
+ + Stub out instance_update() in build instance tests
+ + Raise timeout in fake RPC if no consumers found
+ + Filter network by project id
+ + Convert _poll_unconfirmed_resizes to use Migration object
+ + Fix aggregate creation/update with null or too long name
+ + Fix error messages in v3 aggregate API
+ + Added test case in test_migrations for migration 208
+ + Correct the status code to 201 for create v3
+ + Fix the message of coverage directory error
+ + Implement front end rate-limiting for Cinder volume
+ + Adds Flavor ID validations
+ + Use implicit nullable=True in sqlalchemy model
+ + Pass objects for revert and confirm resizes
+ + Make compute_api use objects for lock/unlock
+ + Convert reset_network to use instance object
+ + Make inject_network_info use objects
+ + Make backup and snapshot use objects
+ + Deprecate conductor migration_create()
+ + Change prep_resize paths to use objects
+ + Add volume snapshot APIs to driver interface
+ + Add db.block_device_mapping_get_by_id
+ + Introduce Invalid* EC2 error codes
+ + Fix HTTP response for PortInUse during boot (v3 API)
+ + Avoid swallowing exceptions in network manager
+ + Removes fixed ips extension from V3 API
+ + Add RBD supporting to libvirt for creating local volume
+ + Add mock to test-requirements
+ + Adds support for security_groups for V3 API server create
+ + Sets policy settings so V3 API extensions are discoverable
+ + fix bad usage of exc_info=True
+ + Assisted snapshots compute API plumbing
+ + Add volume snapshot delete API test case
+ + Add context information to download plugins
+ + Remove capabilities.enabled from test_host_filters
+ + Revert task state when terminate_instance fails
+ + Add PCI device filters support
+ + PCI device auto discover
+
+-------------------------------------------------------------------
+Mon Aug 26 23:59:13 UTC 2013 - opensuse-cl...@opensuse.org
++++ 365 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/openstack-nova/openstack-nova.changes
++++ and /work/SRC/openSUSE:Factory/.openstack-nova.new/openstack-nova.changes
Old:
----
websockify-05.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openstack-nova-doc.spec ++++++
--- /var/tmp/diff_new_pack.A5Tvvj/_old 2013-09-16 12:38:02.000000000 +0200
+++ /var/tmp/diff_new_pack.A5Tvvj/_new 2013-09-16 12:38:02.000000000 +0200
@@ -20,7 +20,7 @@
%define majorversion 2012.2.3
Name: openstack-%{component}-doc
-Version: 2013.2.a2495.g2d86932+git.1375573899.2d86932
+Version: 2013.2.a3318.g79ef562+git.1378251610.79ef562
Release: 0
Summary: OpenStack Compute (Nova) - Documentation
License: Apache-2.0
@@ -61,7 +61,7 @@
This package contains documentation files for openstack-nova.
%prep
-%setup -q -n nova-2013.2.a2495.g2d86932
+%setup -q -n nova-2013.2.a3318.g79ef562
%openstack_cleanup_prep
%build
++++++ openstack-nova.spec ++++++
--- /var/tmp/diff_new_pack.A5Tvvj/_old 2013-09-16 12:38:02.000000000 +0200
+++ /var/tmp/diff_new_pack.A5Tvvj/_new 2013-09-16 12:38:02.000000000 +0200
@@ -22,7 +22,7 @@
%define username openstack-%{component}
Name: openstack-%{component}
-Version: 2013.2.a2495.g2d86932+git.1375573899.2d86932
+Version: 2013.2.a3318.g79ef562+git.1378251610.79ef562
Release: 0
Summary: OpenStack Compute (Nova)
License: Apache-2.0
@@ -48,7 +48,6 @@
# because our qemu and libvirt don't have librados support yet. (Not sure yet
if
# this is worth upstreaming, we would at least have to make in configurable)
Patch3: nova-rbd-use-local-devices.patch
-Patch4: websockify-05.diff
Patch6: remove-babel-runtime-dep.diff
# https://bugs.launchpad.net/nova/+bug/1202199
# https://review.openstack.org/#/c/37477/
@@ -132,9 +131,9 @@
Requires: python-six
Requires: python-sqlalchemy >= 0.7.8
Requires: python-sqlalchemy-migrate >= 0.7.2
-Requires: python-stevedore >= 0.9
+Requires: python-stevedore >= 0.10
Requires: python-suds >= 0.4
-Requires: python-websockify
+Requires: python-websockify >= 0.5.1
%description -n python-nova
This package contains the core Python module of OpenStack Nova.
@@ -266,7 +265,7 @@
Requires: python-feedparser
Requires: python-fixtures >= 0.3.12
Requires: python-flake8 >= 2.0
-Requires: python-hacking >= 0.5.3
+Requires: python-hacking >= 0.5.6
Requires: python-mox >= 0.5.3
Requires: python-pep8 >= 1.4.5
Requires: python-psycopg2
@@ -280,10 +279,9 @@
OpenStack Nova and its components.
%prep
-%setup -q -n nova-2013.2.a2495.g2d86932
-%patch1
+%setup -q -n nova-2013.2.a3318.g79ef562
+%patch1 -p1
%patch2 -p1
-%patch4 -p1
%patch6 -p1
%patch7 -p1
# nova-volume code has been removed upstream in git commit
7e2b93acc59dea81d52684f7f659fcff32507e14
@@ -296,7 +294,7 @@
python setup.py build_sphinx -b man
%install
-python setup.py install -O1 --skip-build --root %{buildroot} --prefix
%{_prefix}
+python setup.py install --root %{buildroot} --prefix %{_prefix}
### directories
install -d -m 755 %{buildroot}%{_localstatedir}/lib/nova
@@ -348,7 +346,7 @@
%openstack_test_package_install
# needed by api_samples test
mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}-test/doc
-cp -r --preserve=timestamps doc/api_samples
%{buildroot}%{_localstatedir}/lib/%{name}-test/doc/
+cp -r --preserve=timestamps doc/api_samples doc/v3
%{buildroot}%{_localstatedir}/lib/%{name}-test/doc/
%fdupes %{buildroot}%{_localstatedir}/lib/%{name}-test
### misc
@@ -609,6 +607,7 @@
%defattr(-,root,root,-)
%doc LICENSE
%config %{_sysconfdir}/nova/rootwrap.d/compute.filters
+%config %{_sysconfdir}/nova/rootwrap.d/docker.filters
%config %{_sysconfdir}/nova/rootwrap.d/baremetal-compute-ipmi.filters
%config %{_sysconfdir}/nova/rootwrap.d/baremetal-deploy-helper.filters
%{_initddir}/%{name}-compute
++++++ 0001-Alwas-set-model-netfront-for-xen-over-libvirt.patch ++++++
--- /var/tmp/diff_new_pack.A5Tvvj/_old 2013-09-16 12:38:02.000000000 +0200
+++ /var/tmp/diff_new_pack.A5Tvvj/_new 2013-09-16 12:38:02.000000000 +0200
@@ -17,10 +17,10 @@
nova/virt/libvirt/vif.py | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
-Index: nova-2013.2.a2481.ge685a72/nova/virt/libvirt/vif.py
+Index: nova-2013.2.a3249.g7c9e6a8/nova/virt/libvirt/vif.py
===================================================================
---- nova-2013.2.a2481.ge685a72.orig/nova/virt/libvirt/vif.py
-+++ nova-2013.2.a2481.ge685a72/nova/virt/libvirt/vif.py
+--- nova-2013.2.a3249.g7c9e6a8.orig/nova/virt/libvirt/vif.py
++++ nova-2013.2.a3249.g7c9e6a8/nova/virt/libvirt/vif.py
@@ -114,6 +114,12 @@ class LibvirtBaseVIFDriver(object):
CONF.libvirt_type in ('kvm', 'qemu') and
CONF.libvirt_use_virtio_for_bridges):
++++++ nova-conf-defaults.patch ++++++
--- /var/tmp/diff_new_pack.A5Tvvj/_old 2013-09-16 12:38:02.000000000 +0200
+++ /var/tmp/diff_new_pack.A5Tvvj/_new 2013-09-16 12:38:02.000000000 +0200
@@ -1,19 +1,7 @@
-Index: etc/nova/api-paste.ini
+Index: nova-2013.2.a3279.g8b5f0c9/etc/nova/nova.conf.sample
===================================================================
---- etc/nova/api-paste.ini.orig
-+++ etc/nova/api-paste.ini
-@@ -120,6 +120,6 @@ admin_password = %SERVICE_PASSWORD%
- # signing_dir is configurable, but the default behavior of the authtoken
- # middleware should be sufficient. It will create a temporary directory
- # in the home directory for the user the nova process is running as.
--#signing_dir = /var/lib/nova/keystone-signing
-+signing_dir = /var/lib/nova/keystone-signing
- # Workaround for https://bugs.launchpad.net/nova/+bug/1154809
- auth_version = v2.0
-Index: etc/nova/nova.conf.sample
-===================================================================
---- etc/nova/nova.conf.sample.orig
-+++ etc/nova/nova.conf.sample
+--- nova-2013.2.a3279.g8b5f0c9.orig/etc/nova/nova.conf.sample
++++ nova-2013.2.a3279.g8b5f0c9/etc/nova/nova.conf.sample
@@ -56,7 +56,7 @@
#
@@ -55,16 +43,16 @@
# Shared secret to validate proxies Neutron metadata requests
# (string value)
-@@ -930,7 +930,7 @@
+@@ -944,7 +944,7 @@
- # hostname or ip for openstack to use when accessing the s3
+ # hostname or ip for OpenStack to use when accessing the s3
# api (string value)
-#s3_host=$my_ip
+s3_host=$my_ip
# port used when accessing the s3 api (integer value)
#s3_port=3333
-@@ -972,7 +972,7 @@
+@@ -986,7 +986,7 @@
# The full class name of the network API class to use (string
# value)
@@ -73,22 +61,16 @@
#
-@@ -1167,12 +1167,12 @@
+@@ -1181,7 +1181,7 @@
#vpn_start=1000
# Number of addresses in each private subnet (integer value)
-#network_size=256
+network_size=256
- # DEPRECATED - Fixed IP address block.If set to an empty
- # string, the subnet range(s) will be automatically determined
- # and configured. (string value)
--#fixed_range=10.0.0.0/8
-+fixed_range=10.0.0.0/8
-
# Fixed IPv6 address block (string value)
#fixed_range_v6=fd00::/48
-@@ -1236,7 +1236,7 @@
+@@ -1245,7 +1245,7 @@
#
# URL for connecting to neutron (string value)
@@ -97,7 +79,7 @@
# timeout value for connecting to neutron in seconds (integer
# value)
-@@ -1244,11 +1244,11 @@
+@@ -1253,11 +1253,11 @@
# username for connecting to neutron in admin context (string
# value)
@@ -111,7 +93,7 @@
# tenant name for connecting to neutron in admin context
# (string value)
-@@ -1267,7 +1267,7 @@
+@@ -1276,7 +1276,7 @@
# auth strategy for connecting to neutron in admin context
# (string value)
@@ -120,7 +102,7 @@
# Name of Integration Bridge used by Open vSwitch (string
# value)
-@@ -1300,7 +1300,7 @@
+@@ -1312,7 +1312,7 @@
#
# The full class name of the security API class (string value)
@@ -129,7 +111,7 @@
#
-@@ -1351,7 +1351,7 @@
+@@ -1363,7 +1363,7 @@
#disable_process_locking=false
# Directory to use for lock files. (string value)
@@ -138,7 +120,7 @@
#
-@@ -1364,7 +1364,7 @@
+@@ -1376,7 +1376,7 @@
# Print more verbose output (set logging level to INFO instead
# of default WARNING level). (boolean value)
@@ -147,7 +129,7 @@
# Log output to standard error (boolean value)
#use_stderr=true
-@@ -1426,7 +1426,7 @@
+@@ -1438,7 +1438,7 @@
# (Optional) The base directory used for relative --log-file
# paths (string value)
@@ -156,7 +138,7 @@
# Use syslog for logging. (boolean value)
#use_syslog=false
-@@ -1532,7 +1532,7 @@
+@@ -1555,7 +1555,7 @@
# The RabbitMQ broker address where a single node is used
# (string value)
@@ -165,7 +147,7 @@
# The RabbitMQ broker port where a single node is used
# (integer value)
-@@ -1851,7 +1851,7 @@
+@@ -1916,7 +1916,7 @@
# fake.FakeDriver, baremetal.BareMetalDriver,
# vmwareapi.VMwareESXDriver, vmwareapi.VMwareVCDriver (string
# value)
@@ -174,7 +156,7 @@
# The default format an ephemeral_volume will be formatted
# with on creation. (string value)
-@@ -1943,7 +1943,7 @@
+@@ -2008,7 +2008,7 @@
#snapshot_image_format=<None>
# The libvirt VIF driver to configure the VIFs. (string value)
@@ -182,13 +164,4 @@
+libvirt_vif_driver=nova.virt.libvirt.vif.LibvirtGenericVIFDriver
# Libvirt handlers for remote volumes. (list value)
-
#libvirt_volume_drivers=iscsi=nova.virt.libvirt.volume.LibvirtISCSIVolumeDriver,local=nova.virt.libvirt.volume.LibvirtVolumeDriver,fake=nova.virt.libvirt.volume.LibvirtFakeVolumeDriver,rbd=nova.virt.libvirt.volume.LibvirtNetVolumeDriver,sheepdog=nova.virt.libvirt.volume.LibvirtNetVolumeDriver,nfs=nova.virt.libvirt.volume.LibvirtNFSVolumeDriver,aoe=nova.virt.libvirt.volume.LibvirtAOEVolumeDriver,glusterfs=nova.virt.libvirt.volume.LibvirtGlusterfsVolumeDriver,fibre_channel=nova.virt.libvirt.volume.LibvirtFibreChannelVolumeDriver,scality=nova.virt.libvirt.volume.LibvirtScalityVolumeDriver
-@@ -2759,7 +2759,7 @@
-
- # The SQLAlchemy connection string used to connect to the
- # bare-metal database (string value)
--#sql_connection=sqlite:///$state_path/baremetal_$sqlite_db
-+sql_connection=sqlite:///$state_path/baremetal_$sqlite_db
-
-
- #
+
#libvirt_volume_drivers=iscsi=nova.virt.libvirt.volume.LibvirtISCSIVolumeDriver,iser=nova.virt.libvirt.volume.LibvirtISERVolumeDriver,local=nova.virt.libvirt.volume.LibvirtVolumeDriver,fake=nova.virt.libvirt.volume.LibvirtFakeVolumeDriver,rbd=nova.virt.libvirt.volume.LibvirtNetVolumeDriver,sheepdog=nova.virt.libvirt.volume.LibvirtNetVolumeDriver,nfs=nova.virt.libvirt.volume.LibvirtNFSVolumeDriver,aoe=nova.virt.libvirt.volume.LibvirtAOEVolumeDriver,glusterfs=nova.virt.libvirt.volume.LibvirtGlusterfsVolumeDriver,fibre_channel=nova.virt.libvirt.volume.LibvirtFibreChannelVolumeDriver,scality=nova.virt.libvirt.volume.LibvirtScalityVolumeDriver
++++++ nova-master.tar.gz ++++++
/work/SRC/openSUSE:Factory/openstack-nova/nova-master.tar.gz
/work/SRC/openSUSE:Factory/.openstack-nova.new/nova-master.tar.gz differ: char
5, line 1
++++++ nova-network-filter-bnc777488.patch ++++++
--- /var/tmp/diff_new_pack.A5Tvvj/_old 2013-09-16 12:38:02.000000000 +0200
+++ /var/tmp/diff_new_pack.A5Tvvj/_new 2013-09-16 12:38:02.000000000 +0200
@@ -1,8 +1,8 @@
-Index: nova-2013.2.a2481.ge685a72/nova/network/linux_net.py
+Index: nova-2013.2.a2699.g7b77052/nova/network/linux_net.py
===================================================================
---- nova-2013.2.a2481.ge685a72.orig/nova/network/linux_net.py
-+++ nova-2013.2.a2481.ge685a72/nova/network/linux_net.py
-@@ -338,6 +338,9 @@ class IptablesManager(object):
+--- nova-2013.2.a2699.g7b77052.orig/nova/network/linux_net.py
++++ nova-2013.2.a2699.g7b77052/nova/network/linux_net.py
+@@ -351,6 +351,9 @@ class IptablesManager(object):
# among the various nova components. It sits at the very top
# of FORWARD and OUTPUT.
for tables in [self.ipv4, self.ipv6]:
@@ -12,10 +12,10 @@
tables['filter'].add_chain('nova-filter-top', wrap=False)
tables['filter'].add_rule('FORWARD', '-j nova-filter-top',
wrap=False, top=True)
-Index: nova-2013.2.a2481.ge685a72/nova/tests/test_iptables_network.py
+Index: nova-2013.2.a2699.g7b77052/nova/tests/test_iptables_network.py
===================================================================
---- nova-2013.2.a2481.ge685a72.orig/nova/tests/test_iptables_network.py
-+++ nova-2013.2.a2481.ge685a72/nova/tests/test_iptables_network.py
+--- nova-2013.2.a2699.g7b77052.orig/nova/tests/test_iptables_network.py
++++ nova-2013.2.a2699.g7b77052/nova/tests/test_iptables_network.py
@@ -37,6 +37,8 @@ class IptablesManagerTestCase(test.TestC
':%s-local - [0:0]' % (binary_name),
':%s-OUTPUT - [0:0]' % (binary_name),
@@ -25,7 +25,7 @@
'[0:0] -A FORWARD -j nova-filter-top',
'[0:0] -A OUTPUT -j nova-filter-top',
'[0:0] -A nova-filter-top -j %s-local' % (binary_name),
-@@ -186,7 +188,15 @@ class IptablesManagerTestCase(test.TestC
+@@ -211,7 +213,15 @@ class IptablesManagerTestCase(test.TestC
"Duplicate line: %s" % line)
seen_lines.add(line)
@@ -42,7 +42,7 @@
for line in new_lines:
if line.startswith('[0:0] -A %s' % chain):
self.assertTrue('-j nova-filter-top' in line,
-@@ -225,7 +235,7 @@ class IptablesManagerTestCase(test.TestC
+@@ -250,7 +260,7 @@ class IptablesManagerTestCase(test.TestC
def test_iptables_top_order(self):
# Test iptables_top_regex
current_lines = list(self.sample_filter)
@@ -51,7 +51,7 @@
self.flags(iptables_top_regex='-j iptables-top-rule')
new_lines = self.manager._modify_rules(current_lines,
self.manager.ipv4['filter'],
-@@ -235,7 +245,7 @@ class IptablesManagerTestCase(test.TestC
+@@ -260,7 +270,7 @@ class IptablesManagerTestCase(test.TestC
def test_iptables_bottom_order(self):
# Test iptables_bottom_regex
current_lines = list(self.sample_filter)
@@ -60,7 +60,7 @@
self.flags(iptables_bottom_regex='-j iptables-bottom-rule')
new_lines = self.manager._modify_rules(current_lines,
self.manager.ipv4['filter'],
-@@ -245,8 +255,8 @@ class IptablesManagerTestCase(test.TestC
+@@ -270,8 +280,8 @@ class IptablesManagerTestCase(test.TestC
def test_iptables_preserve_order(self):
# Test both iptables_top_regex and iptables_bottom_regex
current_lines = list(self.sample_filter)
++++++ remove-babel-runtime-dep.diff ++++++
--- /var/tmp/diff_new_pack.A5Tvvj/_old 2013-09-16 12:38:02.000000000 +0200
+++ /var/tmp/diff_new_pack.A5Tvvj/_new 2013-09-16 12:38:02.000000000 +0200
@@ -1,11 +1,12 @@
-diff -ruN a/requirements.txt b/requirements.txt
---- a/requirements.txt 2013-08-01 14:06:24.000000000 +0200
-+++ b/requirements.txt 2013-08-01 16:23:47.096913428 +0200
-@@ -19,7 +19,6 @@
+Index: nova-2013.2.a2877.ga19f59d/requirements.txt
+===================================================================
+--- nova-2013.2.a2877.ga19f59d.orig/requirements.txt
++++ nova-2013.2.a2877.ga19f59d/requirements.txt
+@@ -19,7 +19,6 @@ netaddr>=0.7.6
suds>=0.4
paramiko
pyasn1
-Babel>=0.9.6
iso8601>=0.1.4
+ jsonschema>=1.3.0,!=1.4.0
python-cinderclient>=1.0.1
- python-neutronclient>=2.2.3,<3.0.0
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
