17e6e629f5
Allow cinder-volume, nova-compute and nova-libvirtd to be configured to use NFS. In order to mount and work with NFS shares, several containers needed the NFS packages installed during build time. One somewhat significant change is the addition of an explicit bind volume for nova-compute that has shared mounts enabled. According to docker-run(1), the shared mount propagation flag can only be specified for bind mounted Docker volumes and not named volumes. In an NFS setup, cinder-volume mounts the NFS shares so that it can create and manage the Cinder volumes. When a new instance is created with a Cinder volume or a Cinder volume is attached to an existing instance, nova-compute mounts the Cinder volume from the NFS share for nova-libvirtd. In order for nova-libvirtd to then see those Cinder volumes the shared mounts flag must be enabled for the Docker volume. Remove the rpcbind container as it is only necessary for operators who are using NFSv3 or lower. There is no known need for this currently however, this container can be added in the future should an operator require it. Co-authored-by: Ryan Hallisey <rhallise@redhat.com> Co-authored-by: Andrew Widdersheim <amwiddersheim@gmail.com> Change-Id: Iad77c05bce8876bdcc69b7ec22edd50e3bf48b9f Closes-Bug: #1530515 Partially implements: blueprint nfs-support-in-cinder
59 lines
1.6 KiB
Django/Jinja
59 lines
1.6 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }}
|
|
MAINTAINER {{ maintainer }}
|
|
|
|
{% block cinder_volume_header %}{% endblock %}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
|
|
|
|
{% set cinder_volume_packages = [
|
|
'nfs-utils',
|
|
'scsi-target-utils'
|
|
] %}
|
|
|
|
{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
|
|
|
|
{% block cinder_volume_redhat_setup %}
|
|
RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf
|
|
{% endblock %}
|
|
|
|
{% elif base_distro in ['ubuntu', 'debian'] %}
|
|
|
|
{% set cinder_volume_packages = [
|
|
'tgt'
|
|
] %}
|
|
|
|
{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
|
|
|
|
{% block cinder_volume_ubuntu_setup %}
|
|
RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf
|
|
{% endblock %}
|
|
|
|
{% endif %}
|
|
|
|
{% if install_type == 'binary' %}
|
|
{% if base_distro in ['ubuntu', 'debian'] %}
|
|
|
|
{% set cinder_volume_packages = [
|
|
'cinder-volume',
|
|
'nfs-common'
|
|
] %}
|
|
|
|
{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
|
|
{% endif %}
|
|
{% endif %}
|
|
|
|
COPY cinder_sudoers /etc/sudoers.d/kolla_cinder_volume_sudoers
|
|
COPY extend_start.sh /usr/local/bin/kolla_cinder_extend_start
|
|
|
|
RUN chmod 750 /etc/sudoers.d \
|
|
&& chmod 440 /etc/sudoers.d/kolla_cinder_volume_sudoers \
|
|
&& chmod 755 /usr/local/bin/kolla_cinder_extend_start
|
|
|
|
{% block cinder_volume_footer %}{% endblock %}
|
|
{% block footer %}{% endblock %}
|
|
{{ include_footer }}
|
|
|
|
USER cinder
|