diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-24 11:36:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-24 11:36:05 +0000 |
| commit | e32471479405266daeab13f748bb0af965b7ab78 (patch) | |
| tree | 0bf5d2710ea1b39af394656f2293cbc7d3113cb1 /docker | |
| parent | 22f55ac23d1f9e89627c86b8c6ec63fdf5d243d8 (diff) | |
| parent | 379475585b9fe83470fe2cf7c0683c4b811db8a8 (diff) | |
| download | kolla-e32471479405266daeab13f748bb0af965b7ab78.tar.gz kolla-e32471479405266daeab13f748bb0af965b7ab78.zip | |
Merge "Add nfs package in manila-data dockerfile"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/manila/manila-data/Dockerfile.j2 | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/docker/manila/manila-data/Dockerfile.j2 b/docker/manila/manila-data/Dockerfile.j2 index ec538dddd..4cdeba325 100644 --- a/docker/manila/manila-data/Dockerfile.j2 +++ b/docker/manila/manila-data/Dockerfile.j2 @@ -17,11 +17,27 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ 'manila-data' ] %} -{{ macros.install_packages(manila_data_packages | customizable("packages")) }} + {% endif %} + +{% elif install_type == 'source' %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + + {% set manila_data_packages = [ + 'nfs-utils' + ] %} + + {% elif base_distro in ['ubuntu', 'debian'] %} + + {% set manila_data_packages = [ + 'nfs-common' + ] %} {% endif %} + {% endif %} +{{ macros.install_packages(manila_data_packages | customizable("packages")) }} + {% block manila_data_footer %}{% endblock %} {% block footer %}{% endblock %} {{ include_footer }} |