Merge lp:~james-page/ceilometer/havana-rc2 into lp:~ubuntu-server-dev/ceilometer/havana

[James Page]

RC2

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-08 15:56:06 +0000
+++ debian/changelog	2013-10-14 12:08:51 +0000
@@ -1,8 +1,11 @@
-ceilometer (2013.2~rc1-0ubuntu2) UNRELEASED; urgency=low
+ceilometer (2013.2~rc2-0ubuntu1) saucy; urgency=low
 
+  * New upstream release candidate (LP: #1239156):
+    - d/p/revert-keystone-compat.patch: Revert keystoneclient 0.4.0 compat
+      fix as this causes test failures against 0.3.4.
   * d/control: Drop a3 from versioned dependency on python-oslo.config.
 
- -- James Page <[e-mail]>  Tue, 08 Oct 2013 16:55:40 +0100
+ -- James Page <[e-mail]>  Mon, 14 Oct 2013 10:30:03 +0100
 
 ceilometer (2013.2~rc1-0ubuntu1) saucy; urgency=low
 
 
=== added file 'debian/patches/revert-keystone-compat.patch'
--- debian/patches/revert-keystone-compat.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/revert-keystone-compat.patch	2013-10-14 12:08:51 +0000
@@ -0,0 +1,82 @@
+Description: Revert keystone 0.4.0 patch from upstream.
+Author: James Page <[e-mail]>
+Bug: https://bugs.launchpad.net/ceilometer/+bug/1239651
+Origin: revert, https://github.com/openstack/ceilometer/commit/c0a3f3cd69eb609216a07111067478f3755cceb4
+
+--- a/etc/ceilometer/ceilometer.conf.sample
++++ b/etc/ceilometer/ceilometer.conf.sample
+@@ -742,10 +742,6 @@ connection=sqlite:////var/lib/ceilometer
+ # server. (boolean value)
+ #http_connect_timeout=<None>
+ 
+-# How many times are we trying to reconnect when communicating
+-# with Identity API Server. (integer value)
+-#http_request_max_retries=3
+-
+ # Allows to pass in the name of a fake http_handler callback
+ # function used instead of httplib.HTTPConnection or
+ # httplib.HTTPSConnection. Useful for unit testing where
+@@ -778,13 +774,6 @@ connection=sqlite:////var/lib/ceilometer
+ # (string value)
+ #keyfile=<None>
+ 
+-# A PEM encoded Certificate Authority to use when verifying
+-# HTTPs connections. Defaults to system CAs. (string value)
+-#cafile=<None>
+-
+-# Verify HTTPS connections. (boolean value)
+-#insecure=false
+-
+ # Directory used to cache files related to PKI tokens (string
+ # value)
+ #signing_dir=<None>
+--- a/tests/api/v2/test_acl_scenarios.py
++++ b/tests/api/v2/test_acl_scenarios.py
+@@ -27,7 +27,6 @@ from ceilometer import sample
+ from ceilometer.api import acl
+ from ceilometer.publisher import rpc
+ from ceilometer.tests import db as tests_db
+-from ceilometer.openstack.common import timeutils
+ 
+ from .base import FunctionalTest
+ 
+@@ -38,8 +37,12 @@ VALID_TOKEN2 = '4562138218392832'
+ 
+ 
+ class FakeMemcache(object):
+-    @staticmethod
+-    def get(key):
++    def __init__(self):
++        self.set_key = None
++        self.set_value = None
++        self.token_expiration = None
++
++    def get(self, key):
+         if key == "tokens/%s" % VALID_TOKEN:
+             dt = datetime.datetime.now() + datetime.timedelta(minutes=5)
+             return json.dumps(({'access': {
+@@ -52,7 +55,7 @@ class FakeMemcache(object):
+                     'roles': [
+                         {'name': 'admin'},
+                     ]},
+-            }}, timeutils.isotime(dt)))
++            }}, dt.strftime("%s")))
+         if key == "tokens/%s" % VALID_TOKEN2:
+             dt = datetime.datetime.now() + datetime.timedelta(minutes=5)
+             return json.dumps(({'access': {
+@@ -65,11 +68,11 @@ class FakeMemcache(object):
+                     'roles': [
+                         {'name': 'Member'},
+                     ]},
+-            }}, timeutils.isotime(dt)))
++            }}, dt.strftime("%s")))
+ 
+-    @staticmethod
+-    def set(key, value, **kwargs):
+-        pass
++    def set(self, key, value, **kwargs):
++        self.set_value = value
++        self.set_key = key
+ 
+ 
+ class TestAPIACL(FunctionalTest,
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-09-19 15:36:08 +0000
+++ debian/patches/series	2013-10-14 12:08:51 +0000
@@ -1,3 +1,4 @@
 default-dbconnection-sqlite.patch
 skip-database-tests.patch
 fix-setup-requirements.patch
+revert-keystone-compat.patch