aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-06-21 04:25:38 +0000
committerGerrit Code Review <review@openstack.org>2018-06-21 04:25:38 +0000
commitd8c7d1b27cf53ee0d4f0e1e0639aaea635a2d0ec (patch)
treef61deaceacf61162d3af5ed829104742f0d8f1a1
parent2954754eb85d6f3f8bdd15f55afd7ca19f41b235 (diff)
parenta49ad13d088078dedc94662a06606376f4dd07c6 (diff)
downloadkolla-d8c7d1b27cf53ee0d4f0e1e0639aaea635a2d0ec.tar.gz
kolla-d8c7d1b27cf53ee0d4f0e1e0639aaea635a2d0ec.zip
Merge "Use RDO version of python-msgpack on RDO"
-rw-r--r--docker/openstack-base/Dockerfile.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 04f02901a..be0a6ce0b 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -34,6 +34,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'pyOpenSSL',
'pyparsing',
'python-crypto',
+ 'python-msgpack',
'python2-cryptography',
'python2-debtcollector',
'python2-eventlet',
@@ -42,7 +43,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python2-futurist',
'python2-greenlet',
'python2-iso8601',
- 'python2-msgpack',
'python2-oslo-concurrency',
'python2-oslo-config',
'python2-oslo-context',