diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-20 12:16:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-20 12:16:13 +0000 |
| commit | 723790fc9f84c130debd0af658471a70b459fd65 (patch) | |
| tree | 2f7d47c3cb39b06c4da3a750955175b5246a7535 /docker/glance | |
| parent | 632f1774b95dbbc9c96cb46d838665362c75d934 (diff) | |
| parent | 806ecd122fb82168fb98d588e60799084f80237c (diff) | |
| download | kolla-723790fc9f84c130debd0af658471a70b459fd65.tar.gz kolla-723790fc9f84c130debd0af658471a70b459fd65.zip | |
Merge "Add oslo-vmware module in glance_base image"
Diffstat (limited to 'docker/glance')
| -rw-r--r-- | docker/glance/glance-base/Dockerfile.j2 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2 index c83c940c2..e4f42f71b 100644 --- a/docker/glance/glance-base/Dockerfile.j2 +++ b/docker/glance/glance-base/Dockerfile.j2 @@ -11,12 +11,14 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set glance_base_packages = [ 'openstack-glance', + 'python-oslo-vmware', 'python-rados', 'python-rbd' ] %} {% elif base_distro in ['debian', 'ubuntu'] %} {% set glance_base_packages = [ 'glance', + 'python-oslo-vmware', 'python-rados', 'python-rbd' ] %} @@ -35,7 +37,8 @@ MAINTAINER {{ maintainer }} ADD glance-base-archive /glance-base-source {% set glance_base_pip_packages = [ - '/glance[cinder]' + '/glance', + 'glance_store[cinder,oslo-vmware,swift]' ] %} RUN ln -s glance-base-source/* glance \ |