openstack/kolla-ansible
Code Issues Proposed changes

Merge "Cinder-backup misses client part for NFS backend"

Browse Source
This commit is contained in:
Jenkins 2016-09-13 13:55:59 +00:00 committed by Gerrit Code Review
commit 6a95a5e2bc
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
docker/cinder/cinder-backup/Dockerfile.j2
View File

@ -4,17 +4,40 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['ubuntu'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
{% set cinder_backup_packages = [ {% set cinder_backup_packages = [
'nfs-utils'
] %}
{% elif base_distro in ['ubuntu'] %}
{% set cinder_backup_packages = [
'nfs-common',
'cinder-backup' 'cinder-backup'
] %} ] %}
{{ macros.install_packages(cinder_backup_packages | customizable("packages")) }} {% endif %}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
{% set cinder_backup_packages = [
'nfs-utils'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set cinder_backup_packages = [
'nfs-common'
] %}
{% endif %} {% endif %}
{% endif %} {% endif %}
{{ macros.install_packages(cinder_backup_packages | customizable("packages")) }}
{% block cinder_backup_footer %}{% endblock %} {% block cinder_backup_footer %}{% endblock %}
{% block footer %}{% endblock %} {% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}