aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-18 07:14:58 +0000
committerGerrit Code Review <review@openstack.org>2017-06-18 07:14:58 +0000
commit6bafdc409a560c9f2b8b51276b5059e24f34ba86 (patch)
tree9e16045a9b75c4f9d3d1eef2c72e56c386b4081d /docker
parent49e45698da71cbea87ede2f2f053fa1e8e9e2817 (diff)
parent5032177d92b19ec764f1d50241a38a40f8a289c0 (diff)
downloadkolla-6bafdc409a560c9f2b8b51276b5059e24f34ba86.tar.gz
kolla-6bafdc409a560c9f2b8b51276b5059e24f34ba86.zip
Merge "Add os-brick to glance container"
Diffstat (limited to 'docker')
-rw-r--r--docker/glance/glance-base/Dockerfile.j25
1 files changed, 3 insertions, 2 deletions
diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2
index ec2204cda..a9ec61d84 100644
--- a/docker/glance/glance-base/Dockerfile.j2
+++ b/docker/glance/glance-base/Dockerfile.j2
@@ -20,7 +20,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'glance',
'python-oslo.vmware',
'python-rados',
- 'python-rbd'
+ 'python-rbd',
+ 'python-os-brick'
] %}
{% endif %}
@@ -38,7 +39,7 @@ ADD glance-base-archive /glance-base-source
{% set glance_base_pip_packages = [
'/glance',
- 'glance_store[cinder,oslo-vmware,swift]'
+ 'glance_store[cinder,oslo-vmware,os-brick,swift]'
] %}
RUN ln -s glance-base-source/* glance \