diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-11 16:58:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-11 16:58:30 +0000 |
| commit | 7178e13d782c32b2d3b32aaadfd5cc6ba39c4a23 (patch) | |
| tree | e073e3df4b65622f7dcb2e260e6491a795887b2b /docker | |
| parent | d389d7aacff98687a7fb625292cf767543e91f15 (diff) | |
| parent | 17e6e629f5660a364498b2bfd2f5aa6aede79859 (diff) | |
| download | kolla-7178e13d782c32b2d3b32aaadfd5cc6ba39c4a23.tar.gz kolla-7178e13d782c32b2d3b32aaadfd5cc6ba39c4a23.zip | |
Merge "Allow cinder-volume to be configured to use NFS"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/cinder/cinder-rpcbind/Dockerfile.j2 | 29 | ||||
| -rw-r--r-- | docker/cinder/cinder-volume/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 4 |
3 files changed, 7 insertions, 31 deletions
diff --git a/docker/cinder/cinder-rpcbind/Dockerfile.j2 b/docker/cinder/cinder-rpcbind/Dockerfile.j2 deleted file mode 100644 index 60eb8672b..000000000 --- a/docker/cinder/cinder-rpcbind/Dockerfile.j2 +++ /dev/null @@ -1,29 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} -MAINTAINER {{ maintainer }} - -{% block cinder_rpcbind_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - - {% set cinder_rpcbind_packages = [ - 'nfs-utils', - 'nfs-utils-lib' - ] %} - -{% elif base_distro in ['ubuntu', 'debian'] %} - - {% set cinder_rpcbind_packages = [ - 'rpcbind' - ] %} - -{% endif %} - -{{ macros.install_packages(cinder_rpcbind_packages | customizable("packages")) }} - -{% block cinder_rpcbind_footer %}{% endblock %} -{% block footer %}{% endblock %} -{{ include_footer }} - -USER cinder diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index 11cd55c7b..ef90fcd91 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -8,6 +8,7 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set cinder_volume_packages = [ + 'nfs-utils', 'scsi-target-utils' ] %} @@ -35,11 +36,11 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf {% if base_distro in ['ubuntu', 'debian'] %} {% set cinder_volume_packages = [ - 'cinder-volume' + 'cinder-volume', + 'nfs-common' ] %} {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }} - {% endif %} {% endif %} diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 461f8b155..46e280a5f 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -15,6 +15,7 @@ MAINTAINER {{ maintainer }} 'ceph-common', 'genisoimage', 'iscsi-initiator-utils', + 'nfs-utils', 'targetcli', 'python-rtslib' ] %} @@ -32,6 +33,7 @@ MAINTAINER {{ maintainer }} 'ironic-common', 'python-ironicclient', 'genisoimage', + 'nfs-common', 'open-iscsi', 'targetcli', 'python-rtslib' @@ -53,6 +55,7 @@ RUN rm -f /etc/nova/nova-compute.conf 'ceph-common', 'genisoimage', 'iscsi-initiator-utils', + 'nfs-utils', 'targetcli', 'python-rtslib' ] %} @@ -64,6 +67,7 @@ RUN rm -f /etc/nova/nova-compute.conf 'qemu-utils', 'ceph-common', 'genisoimage', + 'nfs-common', 'open-iscsi', 'targetcli', 'python-rtslib' |