openstack
/
kolla
Code Issues Proposed changes

Alphabetize packages 

Some images have packages sorted alphabetically and some not.
Unify common style between all images.

Change-Id: I906ed89c10b12886665618752f525ba71d83d991
This commit is contained in:
Eduardo Gonzalez 2017-03-23 20:06:50 +00:00
parent ce716ebe22
commit 623e54da37
38 changed files with 247 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/aodh/aodh-base/Dockerfile.j2
View File

@ -11,10 +11,10 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set aodh_base_packages = [
'openstack-aodh-common',
'httpd',
'mod_wsgi',
'mod_ssl',
'mod_wsgi',
'openstack-aodh-common',
'python-ldappool'
] %}
@ -68,8 +68,8 @@ RUN mkdir -p /var/www/cgi-bin/aodh \
ADD aodh-base-archive /aodh-base-source
{% set aodh_base_pip_packages = [
'pymongo',
'/aodh'
'/aodh',
'pymongo'
] %}
RUN ln -s aodh-base-source/* aodh \

4
docker/barbican/barbican-api/Dockerfile.j2
View File

@ -13,8 +13,8 @@ MAINTAINER {{ maintainer }}
] %}
{% elif base_distro in ['ubuntu'] %}
{% set barbican_api_packages = [
'uwsgi-plugin-python',
'barbican-api'
'barbican-api',
'uwsgi-plugin-python'
] %}
{% endif %}

8
docker/barbican/barbican-base/Dockerfile.j2
View File

@ -26,11 +26,11 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(barbican_base_packages | customizable("packages")) }}
{% set barbican_base_pip_packages = [
'/barbican',
'MySQL-python',
'pastedeploy',
'uwsgi',
'MySQL-python' ,
'python-barbicanclient' ,
'/barbican'
'python-barbicanclient',
'uwsgi'
] %}
ADD barbican-base-archive /barbican-base-source

28
docker/base/Dockerfile.j2
View File

@ -101,10 +101,10 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
] %}
{% set base_centos_yum_repo_packages = [
'epel-release ',
'yum-plugin-priorities',
'centos-release-ceph-jewel',
'centos-release-qemu-ev'
'centos-release-qemu-ev',
'epel-release',
'yum-plugin-priorities'
] %}
{{ macros.install_packages(base_centos_yum_repo_packages | customizable("yum_centos_repo_packages")) }}
@ -170,13 +170,13 @@ RUN yum -y install \
{% block base_redhat_binary_versionlock %}{% endblock %}
{% if install_type == 'binary' %}
{% set base_centos_binary_packages = [
'sudo',
'which',
'python',
'lvm2',
'scsi-target-utils',
'iproute',
'iscsi-initiator-utils'
'iscsi-initiator-utils',
'lvm2',
'python',
'scsi-target-utils',
'sudo',
'which'
] %}
# Install base packages
{{ macros.install_packages( base_centos_binary_packages | customizable("centos_binary_packages")) }}
@ -187,13 +187,13 @@ RUN yum -y install \
{% set base_centos_source_packages = [
'curl',
'sudo',
'tar',
'which',
'iproute',
'iscsi-initiator-utils',
'lvm2',
'scsi-target-utils',
'iproute',
'iscsi-initiator-utils'
'sudo',
'tar',
'which'
] %}
# Update packages
{{ macros.install_packages( base_centos_source_packages | customizable("centos_source_packages")) }}

14
docker/ceilometer/ceilometer-api/Dockerfile.j2
View File

@ -8,18 +8,18 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ceilometer_api_packages = [
'openstack-ceilometer-api',
'httpd',
'mod_ssl',
'mod_wsgi',
'mod_ssl'
'openstack-ceilometer-api'
] %}
{{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['ubuntu'] %}
{% set ceilometer_api_packages = [
'ceilometer-api',
'apache2',
'ceilometer-api',
'libapache2-mod-wsgi'
] %}
{{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }}
@ -32,10 +32,10 @@ RUN echo > /etc/apache2/ports.conf
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ceilometer_api_packages = [
'gettext',
'httpd',
'mod_wsgi',
'mod_ssl',
'gettext'
'mod_wsgi'
] %}
{{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }}
@ -49,8 +49,8 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
{% set ceilometer_api_packages = [
'apache2',
'libapache2-mod-wsgi',
'gettext'
'gettext',
'libapache2-mod-wsgi'
] %}
{{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }}

2
docker/ceilometer/ceilometer-base/Dockerfile.j2
View File

@ -14,9 +14,9 @@ MAINTAINER {{ maintainer }}
{% set ceilometer_base_packages = [
'openstack-ceilometer-common',
'python-gnocchiclient',
'python-tooz',
'python-oslo-db',
'python-pecan',
'python-tooz',
'python-wsme'
] %}
{% elif base_distro in ['ubuntu'] %}

18
docker/ceph/ceph-base/Dockerfile.j2
View File

@ -9,25 +9,25 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ceph_base_packages = [
'btrfs-progs',
'ceph',
'ceph-fuse',
'ceph-radosgw',
'parted',
'e2fsprogs',
'hdparm',
'btrfs-progs',
'xfsprogs',
'e2fsprogs'
'parted',
'xfsprogs'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set ceph_base_packages = [
'btrfs-tools',
'ceph',
'ceph-fuse',
'radosgw',
'parted',
'e2fsprogs',
'hdparm',
'btrfs-tools',
'xfsprogs',
'e2fsprogs'
'parted',
'radosgw',
'xfsprogs'
] %}
{% endif %}
{{ macros.install_packages(ceph_base_packages | customizable("packages")) }}

10
docker/cinder/cinder-api/Dockerfile.j2
View File

@ -8,18 +8,18 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set cinder_api_packages = [
'python-keystone',
'httpd',
'mod_ssl',
'mod_wsgi',
'mod_ssl'
'python-keystone'
] %}
{{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['ubuntu'] %}
{% set cinder_api_packages = [
'cinder-api',
'apache2',
'cinder-api',
'libapache2-mod-wsgi'
] %}
{{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
@ -30,8 +30,8 @@ RUN echo > /etc/apache2/ports.conf
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set cinder_api_packages = [
'httpd',
'mod_wsgi',
'mod_ssl'
'mod_ssl',
'mod_wsgi'
] %}
{{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \

4
docker/cinder/cinder-backup/Dockerfile.j2
View File

@ -12,8 +12,8 @@ MAINTAINER {{ maintainer }}
] %}
{% elif base_distro in ['ubuntu'] %}
{% set cinder_backup_packages = [
'nfs-common',
'cinder-backup'
'cinder-backup',
'nfs-common'
] %}
{% endif %}

16
docker/cinder/cinder-base/Dockerfile.j2
View File

@ -10,15 +10,15 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set cinder_base_packages = [
'openstack-cinder',
'python-automaton',
'ceph-common',
'lvm2',
'ceph-common'
'openstack-cinder',
'python-automaton'
] %}
{% elif base_distro in ['ubuntu'] %}
{% set cinder_base_packages = [
'cinder-common',
'ceph-common',
'cinder-common',
'lvm2'
] %}
{% endif %}
@ -27,15 +27,15 @@ MAINTAINER {{ maintainer }}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set cinder_base_packages = [
'ceph-common',
'lvm2',
'qemu-img',
'ceph-common'
'qemu-img'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set cinder_base_packages = [
'ceph-common',
'lvm2',
'qemu-utils',
'ceph-common'
'qemu-utils'
] %}
{% endif %}
{{ macros.install_packages(cinder_base_packages | customizable("packages")) }}

4
docker/cinder/cinder-volume/Dockerfile.j2
View File

@ -18,8 +18,8 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set cinder_volume_packages = [
'tgt',
'nfs-common'
'nfs-common',
'tgt'
] %}
{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}

8
docker/elasticsearch/Dockerfile.j2
View File

@ -9,16 +9,16 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set elasticsearch_packages = [
'java-1.7.0-openjdk',
'elasticsearch'
'elasticsearch',
'java-1.7.0-openjdk'
] %}
ENV JAVA_HOME /usr/lib/jvm/jre-1.7.0-openjdk/
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set elasticsearch_packages = [
'openjdk-8-jre',
'elasticsearch'
'elasticsearch',
'openjdk-8-jre'
] %}
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/

8
docker/fluentd/Dockerfile.j2
View File

@ -10,17 +10,17 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set fluentd_packages = [
'td-agent',
'gcc-c++',
'make'
'make',
'td-agent'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set fluentd_packages = [
'td-agent',
'g++',
'make',
'g++'
'td-agent'
] %}
{% endif %}

8
docker/freezer/freezer-api/Dockerfile.j2
View File

@ -14,9 +14,9 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set freezer_api_packages = [
'mod_wsgi',
'httpd',
'mod_ssl',
'httpd'
'mod_wsgi'
] %}
{{ macros.install_packages(freezer_api_packages | customizable("packages")) }}
@ -25,8 +25,8 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set freezer_api_packages = [
'libapache2-mod-wsgi',
'apache2'
'apache2',
'libapache2-mod-wsgi'
] %}
{{ macros.install_packages(freezer_api_packages | customizable("packages")) }}

12
docker/glance/glance-base/Dockerfile.j2
View File

@ -11,14 +11,14 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set glance_base_packages = [
'openstack-glance',
'python-rbd',
'python-rados'
'python-rados',
'python-rbd'
] %}
{% elif base_distro in ['ubuntu'] %}
{% set glance_base_packages = [
'glance',
'python-rbd',
'python-rados'
'python-rados',
'python-rbd'
] %}
{% endif %}
@ -26,8 +26,8 @@ MAINTAINER {{ maintainer }}
{% elif install_type == 'source' %}
{% set glance_base_packages = [
'python-rbd',
'python-rados'
'python-rados',
'python-rbd'
] %}
{{ macros.install_packages(glance_base_packages | customizable("packages")) }}

8
docker/gnocchi/gnocchi-base/Dockerfile.j2
View File

@ -11,10 +11,10 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set gnocchi_base_packages = [
'openstack-gnocchi-common',
'httpd',
'mod_wsgi',
'mod_ssl',
'mod_wsgi',
'openstack-gnocchi-common',
'python-ldappool',
'python-rados'
] %}
@ -25,8 +25,8 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
{% elif base_distro in ['ubuntu'] %}
{% set gnocchi_base_packages = [
'gnocchi-common',
'apache2',
'gnocchi-common',
'libapache2-mod-wsgi',
'python-ldappool',
'python-rados'
@ -41,8 +41,8 @@ RUN truncate -s 0 /etc/apache2/ports.conf
{% set gnocchi_base_packages = [
'httpd',
'mod_wsgi',
'mod_ssl',
'mod_wsgi',
'python-ldappool',
'python-rados'
] %}

4
docker/heat/heat-all/Dockerfile.j2
View File

@ -9,8 +9,8 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set heat_all_packages = [
'openstack-heat-api',
'openstack-heat-monolith',
'openstack-heat-engine'
'openstack-heat-engine',
'openstack-heat-monolith'
] %}
{% elif base_distro in ['ubuntu'] %}
RUN echo 'heat-all not yet available for {{ base_distro }}' && /bin/false

12
docker/heat/heat-base/Dockerfile.j2
View File

@ -11,19 +11,19 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set heat_base_packages = [
'openstack-heat-common',
'httpd',
'mod_ssl',
'mod_wsgi',
'mod_ssl'
'openstack-heat-common'
] %}
{{ macros.install_packages(heat_base_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['ubuntu'] %}
{% set heat_base_packages = [
'heat-common',
'apache2',
'libapache2-mod-wsgi',
'heat-common',
'libapache2-mod-wsgi'
] %}
{{ macros.install_packages(heat_base_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf
@ -35,8 +35,8 @@ RUN echo > /etc/apache2/ports.conf
{% set heat_base_packages = [
'httpd',
'mod_wsgi',
'mod_ssl'
'mod_ssl',
'mod_wsgi'
] %}
{{ macros.install_packages(heat_base_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \

20
docker/horizon/Dockerfile.j2
View File

@ -11,12 +11,12 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set horizon_packages = [
'openstack-dashboard',
'httpd',
'mod_wsgi',
'mod_ssl',
'gettext',
'httpd',
'mod_ssl',
'mod_wsgi',
'openstack-cloudkitty-ui',
'openstack-dashboard',
'openstack-ironic-ui',
'openstack-magnum-ui',
'openstack-manila-ui',
@ -47,10 +47,10 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
{% elif base_distro in ['ubuntu'] %}
{% set horizon_packages = [
'openstack-dashboard',
'apache2',
'libapache2-mod-wsgi',
'gettext',
'libapache2-mod-wsgi',
'openstack-dashboard',
'python-manila-ui',
'python-murano-dashboard',
'python-sahara-dashboard',
@ -81,10 +81,10 @@ RUN echo > /etc/apache2/ports.conf \
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set horizon_packages = [
'gettext',
'httpd',
'mod_wsgi',
'mod_ssl',
'gettext'
'mod_wsgi'
] %}
{{ macros.install_packages(horizon_packages | customizable("packages")) }}
@ -98,8 +98,8 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
{% set horizon_packages = [
'apache2',
'libapache2-mod-wsgi',
'gettext'
'gettext',
'libapache2-mod-wsgi'
] %}
{{ macros.install_packages(horizon_packages | customizable("packages")) }}

54
docker/ironic/ironic-conductor/Dockerfile.j2
View File

@ -11,23 +11,23 @@ MAINTAINER {{ maintainer }}
# python-seamicroclient, pyremotevbox package
{% set ironic_conductor_packages = [
'dosfstools',
'util-linux',
'openstack-ironic-conductor',
'qemu-img',
'ipmitool',
'parted',
'gdisk',
'psmisc',
'python-dracclient',
'python-proliantutils',
'python-ironic-inspector-client',
'python-pyghmi',
'pysnmp',
'python-UcsSdk',
'ipmitool',
'openstack-ironic-conductor',
'openwsman-python',
'parted',
'psmisc',
'pysnmp',
'python2-ImcSdk',
'python-dracclient',
'python-ironic-inspector-client',
'python-proliantutils',
'python-pyghmi',
'python-UcsSdk',
'qemu-img',
'shellinabox',
'socat'
'socat',
'util-linux'
] %}
{% elif base_distro in ['ubuntu'] %}
# TODO(jeffrey4l): no python-dracclient, python-oneviewclient, UcsSdk,
@ -35,19 +35,19 @@ MAINTAINER {{ maintainer }}
{% set ironic_conductor_packages = [
'bsdmainutils',
'dosfstools',
'ironic-conductor',
'qemu-utils',
'ipmitool',
'gdisk',
'psmisc',
'ipmitool',
'ironic-conductor',
'parted',
'python-proliantutils',
'psmisc',
'python-ironic-inspector-client',
'python-openwsman',
'python-proliantutils',
'python-pyghmi',
'python-pysnmp4',
'python-scciclient',
'python-seamicroclient',
'python-openwsman',
'qemu-utils',
'shellinabox',
'socat'
] %}
@ -56,25 +56,25 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ironic_conductor_packages = [
'dosfstools',
'util-linux',
'qemu-img',
'fuse',
'gdisk',
'ipmitool',
'parted',
'gdisk',
'psmisc',
'fuse',
'qemu-img',
'shellinabox',
'socat'
'socat',
'util-linux'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set ironic_conductor_packages = [
'bsdmainutils',
'dosfstools',
'qemu-utils',
'ipmitool',
'gdisk',
'psmisc',
'ipmitool',
'parted',
'psmisc',
'qemu-utils',
'shellinabox',
'socat'
] %}

4
docker/ironic/ironic-inspector/Dockerfile.j2
View File

@ -10,8 +10,8 @@ MAINTAINER {{ maintainer }}
{% set ironic_inspector_packages = ['openstack-ironic-inspector'] %}
{% elif base_distro in ['ubuntu'] %}
{% set ironic_inspector_packages = [
'ironic-inspector',
'iptables'
'iptables',
'ironic-inspector'
] %}
{% endif %}

16
docker/ironic/ironic-pxe/Dockerfile.j2
View File

@ -7,25 +7,25 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ironic_pxe_packages = [
'tftp-server',
'syslinux-tftpboot',
'httpd',
'ipxe-bootimgs',
'mod_ssl',
'mod_wsgi',
'mod_ssl'
'syslinux-tftpboot',
'tftp-server'
] %}
{{ macros.install_packages(ironic_pxe_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set ironic_pxe_packages = [
'tftpd-hpa',
'syslinux-common',
'syslinux',
'pxelinux',
'apache2',
'ipxe',
'libapache2-mod-wsgi'
'libapache2-mod-wsgi',
'pxelinux',
'syslinux',
'syslinux-common',
'tftpd-hpa'
] %}
{{ macros.install_packages(ironic_pxe_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf

8
docker/iscsid/Dockerfile.j2
View File

@ -8,15 +8,15 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set iscsid_packages = [
'iscsi-initiator-utils',
'targetcli',
'python-rtslib'
'python-rtslib',
'targetcli'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set iscsid_packages = [
'open-iscsi',
'targetcli',
'python-rtslib'
'python-rtslib',
'targetcli'
] %}
{% endif %}

12
docker/keystone/keystone-base/Dockerfile.j2
View File

@ -10,12 +10,12 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set keystone_base_packages = [
'openstack-keystone',
'python-keystoneclient',
'httpd',
'mod_wsgi',
'mod_ssl',
'python-ldappool'
'mod_wsgi',
'openstack-keystone',
'python-ldappool',
'python-keystoneclient'
] %}
{{ macros.install_packages(keystone_base_packages | customizable("packages")) }}
@ -27,8 +27,8 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
{% elif base_distro in ['ubuntu'] %}
{% set keystone_base_packages = [
'keystone',
'apache2',
'keystone',
'libapache2-mod-wsgi',
'python-ldappool'
] %}
@ -45,8 +45,8 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set keystone_base_packages = [
'httpd',
'mod_wsgi',
'mod_ssl',
'mod_wsgi',
'python-ldappool'
] %}
{{ macros.install_packages(keystone_base_packages | customizable("packages")) }}

10
docker/kolla-toolbox/Dockerfile.j2
View File

@ -19,12 +19,12 @@ MAINTAINER {{ maintainer }}
'libffi-devel',
'libxml2-devel',
'libxslt-devel',
'MariaDB-client',
'MariaDB-devel',
'MariaDB-shared',
'MariaDB-client',
'openssh-clients',
'openssl-devel',
'python-devel',
'openssh-clients'
'python-devel'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
@ -37,9 +37,9 @@ MAINTAINER {{ maintainer }}
'jq',
'libffi-dev',
'libmariadbclient-dev',
'mariadb-client',
'libssl-dev',
'libxslt1-dev',
'mariadb-client',
'python-dev'
] %}
@ -57,10 +57,10 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
{% endblock %}
{% set kolla_toolbox_pip_packages = [
'pytz',
'ansible==2.1.1.0',
'MySQL-python',
'os-client-config==1.26.0',
'pytz',
'pyudev',
'shade==1.16.0'
] %}

4
docker/kubetoolbox/Dockerfile.j2
View File

@ -6,9 +6,9 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% set kubetoolbox_packages = [
'jq',
'ceph-common',
'ipmitool'
'ipmitool',
'jq'
] %}
{{ macros.install_packages(kubetoolbox_packages | customizable("packages")) }}

16
docker/mariadb/Dockerfile.j2
View File

@ -9,23 +9,23 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set mariadb_packages = [
'MariaDB-Galera-server',
'MariaDB-client',
'rsync',
'expect',
'galera',
'socat',
'hostname',
'MariaDB-client',
'MariaDB-Galera-server',
'percona-xtrabackup',
'pv',
'tar',
'expect'
'rsync',
'socat',
'tar'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set mariadb_packages = [
'expect',
'mariadb-galera-server',
'percona-xtrabackup',
'socat',
'expect'
'socat'
] %}
{% endif %}

2
docker/neutron/neutron-base/Dockerfile.j2
View File

@ -28,10 +28,10 @@ MAINTAINER {{ maintainer }}
{% set neutron_base_packages = [
'iproute2',
'keepalived',
'neutron-lbaas-common',
'neutron-plugin-ml2',
'neutron-server',
'openvswitch-switch',
'neutron-lbaas-common',
'python-openvswitch'
] %}

8
docker/neutron/neutron-vpnaas-agent/Dockerfile.j2
View File

@ -8,13 +8,13 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set neutron_vpnaas_agent_packages = [
'openswan',
'openstack-neutron-vpn-agent'
'openstack-neutron-vpn-agent',
'openswan'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set neutron_vpnaas_agent_packages = [
'strongswan',
'neutron-vpn-agent'
'neutron-vpn-agent',
'strongswan'
] %}
{% endif %}

14
docker/nova/nova-api/Dockerfile.j2
View File

@ -9,10 +9,10 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set nova_api_packages = [
'openstack-nova-api',
'httpd',
'mod_ssl',
'mod_wsgi',
'mod_ssl'
'openstack-nova-api'
] %}
{{ macros.install_packages(nova_api_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
@ -21,10 +21,10 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
{% elif base_distro in ['ubuntu'] %}
{% set nova_api_packages = [
'nova-api',
'python-memcache',
'apache2',
'libapache2-mod-wsgi'
'libapache2-mod-wsgi',
'nova-api',
'python-memcache'
] %}
{{ macros.install_packages(nova_api_packages | customizable("packages")) }}
@ -37,8 +37,8 @@ RUN echo > /etc/apache2/ports.conf
{% set nova_api_packages = [
'httpd',
'mod_wsgi',
'mod_ssl'
'mod_ssl',
'mod_wsgi'
] %}
{{ macros.install_packages(nova_api_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \

26
docker/nova/nova-base/Dockerfile.j2
View File

@ -11,20 +11,20 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set nova_base_packages = [
'openstack-nova-common',
'python-keystoneclient',
'python-cinderclient',
'bridge-utils',
'openvswitch'
'openstack-nova-common',
'openvswitch',
'python-cinderclient',
'python-keystoneclient'
] %}
{% elif base_distro in ['ubuntu'] %}
{% set nova_base_packages = [
'nova-common',
'python-nova',
'bridge-utils',
'openvswitch-switch'
'nova-common',
'openvswitch-switch',
'python-nova'
] %}
{% endif %}
@ -42,14 +42,14 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set nova_base_packages = [
'iptables',
'iproute2',
'ebtables',
'dnsmasq',
'bridge-utils',
'python-libvirt',
'dnsmasq',
'ebtables',
'iproute2',
'iptables',
'openssh-client',
'openvswitch-switch'
'openvswitch-switch',
'python-libvirt'
] %}
{% endif %}

52
docker/nova/nova-compute/Dockerfile.j2
View File

@ -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 = [
'ceph-common',
'genisoimage',
'ironic-common',
'nfs-common',
'nova-compute',
'openvswitch-switch',
'sysfsutils',
'ceph-common',
'ironic-common',
'python-ironicclient',
'genisoimage',
'nfs-common',
'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 = [
'dosfstools',
'libvirt-devel',
'libosinfo',
'openvswitch',
'qemu-img',
'sysfsutils',
'ceph-common',
'dosfstools',
'genisoimage',
'iscsi-initiator-utils',
'libvirt-devel',
'libosinfo',
'nfs-utils',
'targetcli',
'python-rtslib'
'openvswitch',
'python-rtslib',
'qemu-img',
'sysfsutils',
'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

22
docker/nova/nova-libvirt/Dockerfile.j2
View File

@ -10,27 +10,27 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set nova_libvirt_packages = [
'libvirt-daemon',
'ceph-common',
'libguestfs',
'openvswitch',
'qemu-kvm',
'libvirt-daemon-driver-nwfilter',
'libvirt-daemon',
'libvirt-daemon-config-nwfilter',
'libvirt-daemon-driver-lxc',
'ceph-common'
'libvirt-daemon-driver-nwfilter',
'openvswitch',
'qemu-kvm'
] %}
{% elif base_distro == 'ubuntu' %}
{% set nova_libvirt_packages = [
'ceph-common',
'libvirt-bin',
'dmidecode',
'ebtables',
'libvirt-bin',
'openvswitch-switch',
'pm-utils',
'qemu',
'qemu-block-extra',
'ebtables',
'xen-utils-4.6'
] %}
@ -38,15 +38,15 @@ MAINTAINER {{ maintainer }}
{% set nova_libvirt_packages = [
'ceph-common',
'libvirt-bin',
'dmidecode',
'ebtables',
'libvirt-bin',
'openvswitch-switch',
'pm-utils',
'qemu',
'qemu-block-extra',
'ebtables',
'xen-utils-4.4',
'usermode'
'usermode',
'xen-utils-4.4'
] %}
{% endif %}

6
docker/nova/nova-placement-api/Dockerfile.j2
View File

@ -10,8 +10,8 @@ MAINTAINER {{ maintainer }}
{% set nova_placement_api_packages = [
'httpd',
'mod_wsgi',
'mod_ssl',
'mod_wsgi',
'openstack-nova-placement-api'
] %}
@ -36,8 +36,8 @@ RUN truncate -s 0 /etc/apache2/ports.conf
{% set nova_placement_api_packages = [
'httpd',
'mod_wsgi',
'mod_ssl'
'mod_ssl',
'mod_wsgi'
] %}
{{ macros.install_packages(nova_placement_api_packages | customizable("packages")) }}

8
docker/nova/nova-spicehtml5proxy/Dockerfile.j2
View File

@ -9,9 +9,9 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set nova_spicehtml5proxy_packages = [
'numpy',
'openstack-nova-spicehtml5proxy',
'spice-html5',
'numpy'
'spice-html5'
] %}
{% elif base_distro in ['ubuntu'] %}
@ -27,8 +27,8 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set nova_spicehtml5proxy_packages = [
'spice-html5',
'numpy'
'numpy',
'spice-html5'
] %}
{% elif base_distro in ['ubuntu'] %}

26
docker/openstack-base/Dockerfile.j2
View File

@ -166,6 +166,8 @@ MAINTAINER {{ maintainer }}
# This will prevent questions from being asked during the install
ENV DEBIAN_FRONTEND noninteractive
{% set openstack_base_packages = [
'openssl',
'patch',
'python-aodhclient',
'python-barbicanclient',
'python-ceilometerclient',
@ -174,24 +176,22 @@ ENV DEBIAN_FRONTEND noninteractive
'python-gnocchiclient',
'python-heatclient',
'python-ironicclient',
'python-keystoneclient',
'python-magnumclient',
'python-manilaclient',
'python-memcache',
'python-mistralclient',
'python-muranoclient',
'python-mysqldb',
'python-openstackclient',
'python-oslo.log',
'python-osprofiler',
'python-pip',
'python-pymysql',
'python-saharaclient',
'python-swiftclient',
'python-troveclient',
'python-zaqarclient',
'python-openstackclient',
'python-pymysql',
'python-keystoneclient',
'python-oslo.log',
'openssl',
'patch'
'python-zaqarclient'
] %}
{% endif %}
@ -217,18 +217,18 @@ ENV DEBIAN_FRONTEND noninteractive
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set openstack_base_packages = [
'ca-certificates',
'build-essential',
'python-dev',
'libssl-dev',
'libmariadbclient-dev',
'libxslt1-dev',
'ca-certificates',
'git',
'libffi-dev',
'libmariadbclient-dev',
'libssl-dev',
'libxml2-dev',
'libxslt1-dev',
'libyaml-dev',
'libz-dev',
'pkg-config',
'git',
'python-dev',
'zip'
] %}
{% endif %}

6
docker/panko/panko-base/Dockerfile.j2
View File

@ -11,10 +11,10 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set panko_base_packages = [
'openstack-panko-common',
'httpd',
'mod_wsgi',
'mod_ssl',
'mod_wsgi',
'openstack-panko-common',
'python-ldappool'
] %}
@ -32,8 +32,8 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% set panko_base_packages = [
'httpd',
'mod_wsgi',
'mod_ssl',
'mod_wsgi',
'python-ldappool'
] %}
{{ macros.install_packages(panko_base_packages | customizable("packages")) }}

4
docker/rabbitmq/Dockerfile.j2
View File

@ -19,9 +19,9 @@ MAINTAINER {{ maintainer }}
{% elif base_distro == 'ubuntu' %}
{% set rabbitmq_packages = [
'erlang-nox',
'socat',
'http://www.rabbitmq.com/releases/rabbitmq-server/v3.6.5/rabbitmq-server_3.6.5-1_all.deb',
'logrotate',
'http://www.rabbitmq.com/releases/rabbitmq-server/v3.6.5/rabbitmq-server_3.6.5-1_all.deb'
'socat'
] %}
{{ macros.install_packages(rabbitmq_packages | customizable("packages")) }}