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

Proposed by James Page on 2013-10-14
Status: Merged
Approved by: Chuck Short on 2013-10-14
Approved revision: 73
Merged at revision: 73
Proposed branch: lp:~james-page/ceilometer/havana-rc2
Merge into: lp:~ubuntu-server-dev/ceilometer/havana
Diff against target: 113 lines (+88/-2)
3 files modified
debian/changelog (+5/-2)
debian/patches/revert-keystone-compat.patch (+82/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~james-page/ceilometer/havana-rc2
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2013-10-14 Pending
Review via email: mp+190933@code.launchpad.net

Description of the change

RC2

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-10-08 15:56:06 +0000
3+++ debian/changelog 2013-10-14 12:08:51 +0000
4@@ -1,8 +1,11 @@
5-ceilometer (2013.2~rc1-0ubuntu2) UNRELEASED; urgency=low
6+ceilometer (2013.2~rc2-0ubuntu1) saucy; urgency=low
7
8+ * New upstream release candidate (LP: #1239156):
9+ - d/p/revert-keystone-compat.patch: Revert keystoneclient 0.4.0 compat
10+ fix as this causes test failures against 0.3.4.
11 * d/control: Drop a3 from versioned dependency on python-oslo.config.
12
13- -- James Page <james.page@ubuntu.com> Tue, 08 Oct 2013 16:55:40 +0100
14+ -- James Page <james.page@ubuntu.com> Mon, 14 Oct 2013 10:30:03 +0100
15
16 ceilometer (2013.2~rc1-0ubuntu1) saucy; urgency=low
17
18
19=== added file 'debian/patches/revert-keystone-compat.patch'
20--- debian/patches/revert-keystone-compat.patch 1970-01-01 00:00:00 +0000
21+++ debian/patches/revert-keystone-compat.patch 2013-10-14 12:08:51 +0000
22@@ -0,0 +1,82 @@
23+Description: Revert keystone 0.4.0 patch from upstream.
24+Author: James Page <james.page@ubuntu.com>
25+Bug: https://bugs.launchpad.net/ceilometer/+bug/1239651
26+Origin: revert, https://github.com/openstack/ceilometer/commit/c0a3f3cd69eb609216a07111067478f3755cceb4
27+
28+--- a/etc/ceilometer/ceilometer.conf.sample
29++++ b/etc/ceilometer/ceilometer.conf.sample
30+@@ -742,10 +742,6 @@ connection=sqlite:////var/lib/ceilometer
31+ # server. (boolean value)
32+ #http_connect_timeout=<None>
33+
34+-# How many times are we trying to reconnect when communicating
35+-# with Identity API Server. (integer value)
36+-#http_request_max_retries=3
37+-
38+ # Allows to pass in the name of a fake http_handler callback
39+ # function used instead of httplib.HTTPConnection or
40+ # httplib.HTTPSConnection. Useful for unit testing where
41+@@ -778,13 +774,6 @@ connection=sqlite:////var/lib/ceilometer
42+ # (string value)
43+ #keyfile=<None>
44+
45+-# A PEM encoded Certificate Authority to use when verifying
46+-# HTTPs connections. Defaults to system CAs. (string value)
47+-#cafile=<None>
48+-
49+-# Verify HTTPS connections. (boolean value)
50+-#insecure=false
51+-
52+ # Directory used to cache files related to PKI tokens (string
53+ # value)
54+ #signing_dir=<None>
55+--- a/tests/api/v2/test_acl_scenarios.py
56++++ b/tests/api/v2/test_acl_scenarios.py
57+@@ -27,7 +27,6 @@ from ceilometer import sample
58+ from ceilometer.api import acl
59+ from ceilometer.publisher import rpc
60+ from ceilometer.tests import db as tests_db
61+-from ceilometer.openstack.common import timeutils
62+
63+ from .base import FunctionalTest
64+
65+@@ -38,8 +37,12 @@ VALID_TOKEN2 = '4562138218392832'
66+
67+
68+ class FakeMemcache(object):
69+- @staticmethod
70+- def get(key):
71++ def __init__(self):
72++ self.set_key = None
73++ self.set_value = None
74++ self.token_expiration = None
75++
76++ def get(self, key):
77+ if key == "tokens/%s" % VALID_TOKEN:
78+ dt = datetime.datetime.now() + datetime.timedelta(minutes=5)
79+ return json.dumps(({'access': {
80+@@ -52,7 +55,7 @@ class FakeMemcache(object):
81+ 'roles': [
82+ {'name': 'admin'},
83+ ]},
84+- }}, timeutils.isotime(dt)))
85++ }}, dt.strftime("%s")))
86+ if key == "tokens/%s" % VALID_TOKEN2:
87+ dt = datetime.datetime.now() + datetime.timedelta(minutes=5)
88+ return json.dumps(({'access': {
89+@@ -65,11 +68,11 @@ class FakeMemcache(object):
90+ 'roles': [
91+ {'name': 'Member'},
92+ ]},
93+- }}, timeutils.isotime(dt)))
94++ }}, dt.strftime("%s")))
95+
96+- @staticmethod
97+- def set(key, value, **kwargs):
98+- pass
99++ def set(self, key, value, **kwargs):
100++ self.set_value = value
101++ self.set_key = key
102+
103+
104+ class TestAPIACL(FunctionalTest,
105
106=== modified file 'debian/patches/series'
107--- debian/patches/series 2013-09-19 15:36:08 +0000
108+++ debian/patches/series 2013-10-14 12:08:51 +0000
109@@ -1,3 +1,4 @@
110 default-dbconnection-sqlite.patch
111 skip-database-tests.patch
112 fix-setup-requirements.patch
113+revert-keystone-compat.patch

Subscribers

People subscribed via source and target branches