diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-13 13:55:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-13 13:55:59 +0000 |
| commit | 6a95a5e2bc99ee6cd92704913aa18b02423c5e41 (patch) | |
| tree | 19413a1650bcf5175f275d46e335fa4e808cbf90 | |
| parent | d312dfed957fb9fdb3b83a430c5f5f78cdc617d5 (diff) | |
| parent | 504fc351baf11238fe7f61e7d216531744df3dfb (diff) | |
| download | kolla-6a95a5e2bc99ee6cd92704913aa18b02423c5e41.tar.gz kolla-6a95a5e2bc99ee6cd92704913aa18b02423c5e41.zip | |
Merge "Cinder-backup misses client part for NFS backend"
| -rw-r--r-- | docker/cinder/cinder-backup/Dockerfile.j2 | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/docker/cinder/cinder-backup/Dockerfile.j2 b/docker/cinder/cinder-backup/Dockerfile.j2 index 4cec33a55..3c616f793 100644 --- a/docker/cinder/cinder-backup/Dockerfile.j2 +++ b/docker/cinder/cinder-backup/Dockerfile.j2 @@ -4,17 +4,40 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['ubuntu'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% set cinder_backup_packages = [ + 'nfs-utils' + ] %} + + {% elif base_distro in ['ubuntu'] %} + + {% set cinder_backup_packages = [ + 'nfs-common', '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 %} +{{ macros.install_packages(cinder_backup_packages | customizable("packages")) }} + {% block cinder_backup_footer %}{% endblock %} {% block footer %}{% endblock %} {{ include_footer }} |