diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-03 16:17:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-03 16:17:58 +0000 |
| commit | 2d278ea347feb254232295b69a90955b588698c3 (patch) | |
| tree | f42d3dcc6f66af30f7501fac8b07d28b4301008c /docker/nova/nova-compute | |
| parent | a728239f41a2f1bd9b42d635c596835c934a2698 (diff) | |
| parent | 623e54da372563d068f0edf979b04996d70b306c (diff) | |
| download | kolla-2d278ea347feb254232295b69a90955b588698c3.tar.gz kolla-2d278ea347feb254232295b69a90955b588698c3.zip | |
Merge "Alphabetize packages"
Diffstat (limited to 'docker/nova/nova-compute')
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 614f5e2b0..164abf83e 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -9,15 +9,15 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set nova_compute_packages = [ - 'openstack-nova-compute', - 'openvswitch', - 'sysfsutils', 'ceph-common', 'genisoimage', 'iscsi-initiator-utils', 'nfs-utils', - 'targetcli', - 'python-rtslib' + 'openstack-nova-compute', + 'openvswitch', + 'python-rtslib', + 'sysfsutils', + 'targetcli' ] %} {{ macros.install_packages(nova_compute_packages | customizable("packages")) }} @@ -26,17 +26,17 @@ MAINTAINER {{ maintainer }} # ironic as workaround https://bugs.launchpad.net/packstack/+bug/1430388 {% set nova_compute_packages = [ - 'nova-compute', - 'openvswitch-switch', - 'sysfsutils', 'ceph-common', - 'ironic-common', - 'python-ironicclient', 'genisoimage', + 'ironic-common', 'nfs-common', + 'nova-compute', + 'openvswitch-switch', 'open-iscsi', - 'targetcli', - 'python-rtslib' + 'python-ironicclient', + 'python-rtslib', + 'sysfsutils', + 'targetcli' ] %} {{ macros.install_packages(nova_compute_packages | customizable("packages")) }} @@ -48,33 +48,33 @@ RUN rm -f /etc/nova/nova-compute.conf {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set nova_compute_packages = [ + 'ceph-common', 'dosfstools', + 'genisoimage', + 'iscsi-initiator-utils', 'libvirt-devel', 'libosinfo', + 'nfs-utils', 'openvswitch', + 'python-rtslib', 'qemu-img', 'sysfsutils', - 'ceph-common', - 'genisoimage', - 'iscsi-initiator-utils', - 'nfs-utils', - 'targetcli', - 'python-rtslib' + 'targetcli' ] %} {% elif base_distro in ['ubuntu', 'debian'] %} {% set nova_compute_packages = [ + 'ceph-common', 'dosfstools', + 'genisoimage', 'libosinfo-bin', 'libvirt-dev', - 'qemu-utils', - 'ceph-common', - 'genisoimage', 'nfs-common', 'open-iscsi', - 'targetcli', - 'python-rtslib' + 'python-rtslib', + 'qemu-utils', + 'targetcli' ] %} RUN mkdir -p /etc/ceph |