openstack/kolla
Code Issues Proposed changes

Merge "Add sqlite package to manila-share"

Browse Source
This commit is contained in:
Zuul 2019-05-07 19:42:35 +00:00 committed by Gerrit Code Review
commit 64967045f7
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/manila/manila-share/Dockerfile.j2
View File

@ -10,12 +10,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set manila_share_packages = [ {% set manila_share_packages = [
'openstack-manila-share', 'openstack-manila-share',
'ceph-common' 'ceph-common',
'sqlite'
] %} ] %}
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
{% set manila_share_packages = [ {% set manila_share_packages = [
'manila-share', 'manila-share',
'ceph-common' 'ceph-common',
'sqlite3'
] %} ] %}
{% endif %} {% endif %}
@ -25,11 +27,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set manila_share_packages = [ {% set manila_share_packages = [
'ceph-common' 'ceph-common',
'sqlite'
] %} ] %}
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
{% set manila_share_packages = [ {% set manila_share_packages = [
'ceph-common' 'ceph-common',
'sqlite3'
] %} ] %}
{% endif %} {% endif %}