From 504fc351baf11238fe7f61e7d216531744df3dfb Mon Sep 17 00:00:00 2001
From: Vladislav Belogrudov <vladislav.belogrudov@oracle.com>
Date: Tue, 6 Sep 2016 13:25:30 +0300
Subject: [PATCH] Cinder-backup misses client part for NFS backend
When using an NFS server for backup a cinder container mounts a location
specified in configuration file (one can do this via add-on files).
The mount process fails due to missing mount.nfs and mount.nfs4 tools.
Change-Id: Ic34667c1bf4d4660a4e773a9f8d98996ea11c070
Closes-Bug: #1620548
---
docker/cinder/cinder-backup/Dockerfile.j2 | 27 +++++++++++++++++++++--
1 file changed, 25 insertions(+), 2 deletions(-)
diff --git a/docker/cinder/cinder-backup/Dockerfile.j2 b/docker/cinder/cinder-backup/Dockerfile.j2
index 4cec33a551..3c616f7931 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 }}