diff options
| author | Zuul <zuul@review.opendev.org> | 2019-10-31 11:28:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-10-31 11:28:37 +0000 |
| commit | e35a9aa1485006d899f6efb002c46d2f28e4b88f (patch) | |
| tree | e51e5483e511e2389c09142110af310125727f1e /docker | |
| parent | 468e908f4ff035707f3d08dcedf080651d6f9dde (diff) | |
| parent | 9b1a243a3a1669532f25bbdcbc56b78f0f72882c (diff) | |
| download | kolla-e35a9aa1485006d899f6efb002c46d2f28e4b88f.tar.gz kolla-e35a9aa1485006d899f6efb002c46d2f28e4b88f.zip | |
Merge "Add xfsprogs to nova-compute"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index ffc321318..c22b76b2c 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -20,7 +20,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openvswitch', 'parted', 'sysfsutils', - 'targetcli' + 'targetcli', + 'xfsprogs' ] %} {% if distro_python_version.startswith('3') %} @@ -61,7 +62,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python3-rbd', 'python3-rtslib-fb', 'sysfsutils', - 'targetcli-fb' + 'targetcli-fb', + 'xfsprogs' ] %} {{ macros.install_packages(nova_compute_packages | customizable("packages")) }} @@ -88,7 +90,8 @@ RUN rm -f /etc/nova/nova-compute.conf 'python-rtslib', 'qemu-img-ev', 'sysfsutils', - 'targetcli' + 'targetcli', + 'xfsprogs' ] %} {% elif base_package_type == 'deb' %} @@ -110,7 +113,8 @@ RUN rm -f /etc/nova/nova-compute.conf 'python3-rbd', 'python3-rtslib-fb', 'qemu-utils', - 'targetcli-fb' + 'targetcli-fb', + 'xfsprogs' ] %} {% if base_arch == "aarch64" %} |