Bug 1065329

Waiting for the PM ack before pushing and building.

pm_ack for rebase to 2013.2.2

Linked to Launchpad bugs upstream not already covered by Red Hat Bugzilla.

Also the rebase subsumed the following previously internally backported fixes:

  https://bugzilla.redhat.com1047872
  https://bugzilla.redhat.com1047877
  https://bugzilla.redhat.com1047882

Manually verified that the rebased sources are present. As expected the only deltas seen were due to additional patches we carry in RHOS:

  $ wget http://tarballs.openstack.org/ceilometer/ceilometer-2013.2.2.tar.gz
  $ tar xvf ceilometer-2013.2.2.tar.gz 
  $ cd /usr/lib/python2.6/site-packages/ceilometer/
  $ for f in $(find . -name "*.py") ; do diff $f /tmp/ceilometer-2013.2.2/ceilometer/$f ; if [[ $? -ne 0 ]] ; then echo $f ; fi ; done
0a1
> #!/usr/bin/env python
./tests/base.py
16,37d15
< 
< import sys
< import pkg_resources
< 
< # If there is a conflicting non egg module,
< # i.e. an older standard system module installed,
< # then replace it with this requirement
< def replace_dist(requirement):
<     try:
<         return pkg_resources.require(requirement)
<     except pkg_resources.VersionConflict:
<         e = sys.exc_info()[1]
<         dist=e.args[0]
<         req=e.args[1]
<         if dist.key == req.key and not dist.location.endswith('.egg'):
<             del pkg_resources.working_set.by_key[dist.key]
<             # We assume there is no need to adjust sys.path
<             # and the associated pkg_resources.working_set.entries
<             return pkg_resources.require(requirement)
< 
< replace_dist("WebOb >= 1.2")
< replace_dist("SQLAlchemy >= 0.7.3")
./__init__.py
0a1
> #!/usr/bin/env python
./service.py
0a1
> #!/usr/bin/env python
./objectstore/swift_middleware.py
0a1
> #!/usr/bin/env python
./storage/sqlalchemy/migrate_repo/manage.py
58,64c58
< try:
<     # Try the more specific path first (migrate <= 0.6)
<     from migrate.versioning import exceptions as versioning_exceptions
< except ImportError:
<     # Use the newer path (migrate >= 0.7)
<     from migrate import exceptions as versioning_exceptions
< 
---
> from migrate import exceptions as versioning_exceptions
./storage/sqlalchemy/migration.py

Since the problem described in this bug report should be
resolved in a recent advisory, it has been closed with a
resolution of ERRATA.

For information on the advisory, and where to find the updated
files, follow the link below.

If the solution does not work for you, open a new bug report.

http://rhn.redhat.com/errata/RHBA-2014-0213.html