aboutsummaryrefslogtreecommitdiff
path: root/docker/nova/nova-compute
diff options
context:
space:
mode:
authorEduardo Gonzalez <dabarren@gmail.com>2017-03-23 20:06:50 +0000
committerEduardo Gonzalez <dabarren@gmail.com>2017-03-28 16:45:16 +0100
commit623e54da372563d068f0edf979b04996d70b306c (patch)
tree10418a89eaed60e17cf0b01a472fc9fe146f9041 /docker/nova/nova-compute
parentce716ebe228a29f37fbdfc69aaa34413e6f409a5 (diff)
downloadkolla-623e54da372563d068f0edf979b04996d70b306c.tar.gz
kolla-623e54da372563d068f0edf979b04996d70b306c.zip
Alphabetize packages
Some images have packages sorted alphabetically and some not. Unify common style between all images. Change-Id: I906ed89c10b12886665618752f525ba71d83d991
Diffstat (limited to 'docker/nova/nova-compute')
-rw-r--r--docker/nova/nova-compute/Dockerfile.j246
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