aboutsummaryrefslogtreecommitdiffstats
path: root/meta-openstack
diff options
context:
space:
mode:
authorMark Asselstine <mark.asselstine@windriver.com>2017-11-13 14:32:22 -0500
committerBruce Ashfield <bruce.ashfield@windriver.com>2017-11-14 12:38:27 -0500
commit1853c434f5986bdf763efc07e8b957b74efc9f43 (patch)
tree50a155c42805ed5743638ba9d378f6a50cdfb8d0 /meta-openstack
parent9ba4c53af7427d1e58e613a7a0641c864714c14d (diff)
downloadmeta-cloud-services-1853c434f5986bdf763efc07e8b957b74efc9f43.tar.gz
meta-cloud-services-1853c434f5986bdf763efc07e8b957b74efc9f43.tar.bz2
meta-cloud-services-1853c434f5986bdf763efc07e8b957b74efc9f43.zip
python-ceilometerclient: uprev to latest stable/pike
Drop old patches and update runtime dependency list. Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack')
-rw-r--r--meta-openstack/recipes-devtools/python/python-ceilometerclient/fix_ceilometerclient_memory_leak.patch37
-rw-r--r--meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb23
2 files changed, 9 insertions, 51 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometerclient/fix_ceilometerclient_memory_leak.patch b/meta-openstack/recipes-devtools/python/python-ceilometerclient/fix_ceilometerclient_memory_leak.patch
deleted file mode 100644
index 8abc654..0000000
--- a/meta-openstack/recipes-devtools/python/python-ceilometerclient/fix_ceilometerclient_memory_leak.patch
+++ /dev/null
@@ -1,37 +0,0 @@
----
- ceilometerclient/openstack/common/apiclient/client.py | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
---- a/ceilometerclient/openstack/common/apiclient/client.py
-+++ b/ceilometerclient/openstack/common/apiclient/client.py
-@@ -90,6 +90,7 @@
- self.user_agent = user_agent or self.user_agent
-
- self.times = [] # [("item", starttime, endtime), ...]
-+ self.times_max_len = 200
- self.timings = timings
-
- # requests within the same session can reuse TCP connections from pool
-@@ -142,6 +143,12 @@
- def reset_timings(self):
- self.times = []
-
-+ def get_timings_max_len(self):
-+ return self.times_max_len
-+
-+ def set_timings_max_len(self, new_len):
-+ self.times_max_len = new_len
-+
- def request(self, method, url, **kwargs):
- """Send an http request with the specified characteristics.
-
-@@ -173,6 +180,9 @@
- if self.timings:
- self.times.append(("%s %s" % (method, url),
- start_time, time.time()))
-+ # remove oldest items until we maintain max length
-+ while len(self.times) > self.times_max_len:
-+ del self.times[0]
- self._http_log_resp(resp)
-
- if resp.status_code >= 400:
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb
index a830e51..0341cac 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb
@@ -9,30 +9,25 @@ DEPENDS += " \
python-pbr \
"
-RDEPENDS_${PN} +=" \
- python-cliff \
- python-httplib2 \
- python-iso8601 \
- python-prettytable \
- python-pyparsing \
- python-simplejson \
- python-pbr \
+RDEPENDS_${PN} += " \
+ python-pbr \
+ python-iso8601 \
+ python-keystoneauth1 \
python-oslo.i18n \
python-oslo.serialization \
python-oslo.utils \
- python-keystoneclient \
+ python-prettytable \
python-requests \
python-six \
python-stevedore \
- "
+ "
SRC_URI = "\
- git://github.com/openstack/python-ceilometerclient.git;branch=master \
- file://fix_ceilometerclient_memory_leak.patch \
+ git://github.com/openstack/python-ceilometerclient.git;branch=stable/pike \
"
-PV = "1.5.0+git${SRCPV}"
-SRCREV = "daed7e59c383f1ca74d75160cbc99fbd89675648"
+PV = "2.9.0+git${SRCPV}"
+SRCREV = "4ee321feeef39fa2a297ad8e58e931b8a03d8f14"
S = "${WORKDIR}/git"
inherit setuptools rmargparse