diff options
| author | Zuul <zuul@review.opendev.org> | 2019-05-20 17:37:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-05-20 17:37:29 +0000 |
| commit | 728d49e14068a6977c6e6cb601278dcf69b2e9ff (patch) | |
| tree | bfee9b3a5b25e6f35e718ae7b6f1de52c973deb2 /docker | |
| parent | 58f90e7365b6f121f0235ca4646794e8b6cca560 (diff) | |
| parent | 81c325048c843815dbcc3ca86b12108aff8abef7 (diff) | |
| download | kolla-728d49e14068a6977c6e6cb601278dcf69b2e9ff.tar.gz kolla-728d49e14068a6977c6e6cb601278dcf69b2e9ff.zip | |
Merge "Add sqlite package to manila-share" into stable/stein
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/manila/manila-share/Dockerfile.j2 | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/docker/manila/manila-share/Dockerfile.j2 b/docker/manila/manila-share/Dockerfile.j2 index 64f86ecbb..cf58a36f0 100644 --- a/docker/manila/manila-share/Dockerfile.j2 +++ b/docker/manila/manila-share/Dockerfile.j2 @@ -10,12 +10,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set manila_share_packages = [ 'openstack-manila-share', - 'ceph-common' + 'ceph-common', + 'sqlite' ] %} {% elif base_package_type == 'deb' %} {% set manila_share_packages = [ 'manila-share', - 'ceph-common' + 'ceph-common', + 'sqlite3' ] %} {% endif %} @@ -25,11 +27,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif install_type == 'source' %} {% if base_package_type == 'rpm' %} {% set manila_share_packages = [ - 'ceph-common' + 'ceph-common', + 'sqlite' ] %} {% elif base_package_type == 'deb' %} {% set manila_share_packages = [ - 'ceph-common' + 'ceph-common', + 'sqlite3' ] %} {% endif %} |