summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-05-14 17:58:51 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-06-04 13:45:44 (GMT)
commitd8a67b8baaee5015cc8311ce065c3f9de5dbaca9 (patch)
treefc5a28bdcc25fa32570d8180a5e09b6af20e0650
parent13b41f6f83a4c28f450a4af9c64c72afb8bda58f (diff)
downloaddefinitions-d8a67b8baaee5015cc8311ce065c3f9de5dbaca9.tar.gz
Upgrade ceilometer to 2015.1.0 (Kilo), and dependencies
New components needed - redis-py 2.10.3 - kafka-python 0.9.3 - werkzeug 0.10.4 The following upgrades were needed: - python-ceilometerclient to 1.0.14 - tooz to 0.13.2 - pymemcache to v1.2.9 - zake to 0.2.1
-rw-r--r--strata/openstack-clients.morph4
-rw-r--r--strata/openstack-services.morph41
-rw-r--r--strata/test-tools.morph6
3 files changed, 33 insertions, 18 deletions
diff --git a/strata/openstack-clients.morph b/strata/openstack-clients.morph
index b24f3d7..86251e8 100644
--- a/strata/openstack-clients.morph
+++ b/strata/openstack-clients.morph
@@ -66,8 +66,8 @@ chunks:
- python-keystoneclient
- name: python-ceilometerclient
repo: upstream:openstack/python-ceilometerclient
- ref: 7316dd16b8850270db27c1298dcf5a2223f2f1e1
- unpetrify-ref: 1.0.12
+ ref: 127aadfd2b2daf9884ad7003e23440048e2efbd8
+ unpetrify-ref: 1.0.14
build-depends:
- python-keystoneclient
- name: python-heatclient
diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph
index 96bad48..283746a 100644
--- a/strata/openstack-services.morph
+++ b/strata/openstack-services.morph
@@ -556,46 +556,61 @@ chunks:
- suds
- oslo-vmware
- name: pymemcache
- repo: upstream:python-packages/pymemcache.git
- ref: 3824d3b0bcdea3e8d0c08598bedfce10fd3c79e0
- unpetrify-ref: master
+ repo: upstream:python-packages/pymemcache
+ ref: 0646937c2bfebdb557ec2c01f0e42a9af79ad49d
+ unpetrify-ref: v1.2.9
- name: sysv_ipc-tarball
repo: upstream:python-packages/sysv-ipc-tarball.git
ref: a77e3a63f004e6ee789fa05e4a5bbc333b1529f1
unpetrify-ref: sysv_ipc-0.6.8
+- name: redis-py
+ repo: upstream:python-packages/redis-py
+ ref: 4d0b0afe9c9a431ed50c3e9fb95a0aa88b1f1038
+ unpetrify-ref: 2.10.3
- name: tooz
- repo: upstream:python-packages/tooz.git
- ref: a90940a506b7c1bf52ef7d2f2ff52204fdcc6221
- unpetrify-ref: 0.7
+ repo: upstream:python-packages/tooz
+ ref: 8086661f404e61c22f0dd1d07b57a864862a0869
+ unpetrify-ref: 0.13.2
build-depends:
- pymemcache
- - sysv_ipc-tarball
- msgpack-python
- retrying
+ - redis-py
+- name: kafka-python
+ repo: upstream:python-packages/kafka-python
+ ref: 8675c3e3e620df5ba9fd7e570c554b773429bd78
+ unpetrify-ref: v0.9.3
+- name: werkzeug
+ repo: upstream:python-packages/werkzeug
+ ref: 96e49709d627a7766077cff4c98ebf3cad868ceb
+ unpetrify-ref: v0.10.4
- name: ceilometer
repo: upstream:openstack/ceilometer
morph: strata/openstack-services/ceilometer.morph
- ref: 720c2b4915caf5decd3da91ea2d6e6291316b940
- unpetrify-ref: 2014.2.3
+ ref: b0447ed8e7bee371bf7095c86e47d717abe89edc
+ unpetrify-ref: 2014.1.0
build-depends:
+ - retrying
- alembic
- - anyjson
- croniter
- - happybase
- jsonpath-rw
+ - kafka-python
- keystonemiddleware
- - lockfile
- msgpack-python
+ - oslo-context
- oslo-db
+ - oslo-concurrency
+ - oslo-policy
- oslo-rootwrap
- - oslo-vmware
- pecan
- posix-ipc-tarball
- oslo-messaging
+ - oslo-middleware
- pysnmp
- sqlalchemy
- sqlalchemy-migrate
- tooz
+ - werkzeug
- wsme
- name: django-openstack-auth
repo: upstream:openstack/django_openstack_auth
diff --git a/strata/test-tools.morph b/strata/test-tools.morph
index ca87b29..2c85200 100644
--- a/strata/test-tools.morph
+++ b/strata/test-tools.morph
@@ -81,9 +81,9 @@ chunks:
ref: f7f87e4ac1c52342162cf2035f5fe3d273f8b07f
unpetrify-ref: master
- name: zake
- repo: upstream:python-packages/zake.git
- ref: 13b92d9db4ad37d9550ef5c5abd323a2530a1e72
- unpetrify-ref: master
+ repo: upstream:python-packages/zake
+ ref: 436bab3306aeec420f1281f34bd5d26d7f81038c
+ unpetrify-ref: 0.2.1
build-depends:
- testtools
- name: nose