openstack
/
kolla
Code Issues Proposed changes

Merge "docker: drop binary parts"

This commit is contained in:
Zuul 2022-04-11 09:39:28 +00:00 committed by Gerrit Code Review
parent 26fd382f17 1749da2fbf
commit 657820362d
151 changed files with 552 additions and 3160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
docker/aodh/aodh-api/Dockerfile.j2
View File

@ -7,19 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set aodh_api_packages = ['openstack-aodh-api'] %}
{% elif base_package_type == 'deb' %}
{% set aodh_api_packages = ['aodh-api'] %}
{% endif %}
{{ macros.install_packages(aodh_api_packages | customizable("packages")) }}
{% if base_package_type == 'deb' %}
RUN rm -rf /etc/apache2/sites-enabled/aodh-api.conf
{% endif %}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_aodh_extend_start
RUN chmod 755 /usr/local/bin/kolla_aodh_extend_start

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

@ -9,34 +9,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='aodh') }}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{# NOTE(aschultz): added api because the common package doesn't include the wsgi file. I think this needs fixing #}
{% set aodh_base_packages = [
'openstack-aodh-api',
'openstack-aodh-common',
] %}
{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/aodh \
&& cp -a /usr/bin/aodh-api /var/www/cgi-bin/aodh/
{% elif base_package_type == 'deb' %}
{% set aodh_base_packages = [
'aodh-common',
'python3-aodh',
] %}
{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/aodh \
&& cp -a /usr/lib/python3/dist-packages/aodh/api/app.wsgi /var/www/cgi-bin/aodh/
{% endif %}
{% elif install_type == 'source' %}
{% set aodh_base_packages = [
] %}
{% set aodh_base_packages = [
] %}
{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/aodh
@ -53,8 +27,6 @@ RUN ln -s aodh-base-source/* aodh \
&& cp /aodh/aodh/api/app.wsgi /var/www/cgi-bin/aodh \
&& chown -R aodh: /etc/aodh /var/www/cgi-bin/aodh
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
COPY aodh_sudoers /etc/sudoers.d/kolla_aodh_sudoers

9
docker/aodh/aodh-evaluator/Dockerfile.j2
View File

@ -7,15 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set aodh_evaluator_packages = ['openstack-aodh-evaluator'] %}
{% elif base_package_type == 'deb' %}
{% set aodh_evaluator_packages = ['aodh-evaluator'] %}
{% endif %}
{{ macros.install_packages(aodh_evaluator_packages | customizable("packages")) }}
{% endif %}
{% block aodh_evaluator_footer %}{% endblock %}
{% block footer %}{% endblock %}

9
docker/aodh/aodh-expirer/Dockerfile.j2
View File

@ -7,15 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set aodh_expirer_packages = ['openstack-aodh-expirer'] %}
{% elif base_package_type == 'deb' %}
{% set aodh_expirer_packages = ['aodh-expirer'] %}
{% endif %}
{{ macros.install_packages(aodh_expirer_packages | customizable("packages")) }}
{% endif %}
{% block aodh_expirer_footer %}{% endblock %}
{% block footer %}{% endblock %}

9
docker/aodh/aodh-listener/Dockerfile.j2
View File

@ -7,15 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set aodh_listener_packages = ['openstack-aodh-listener'] %}
{% elif base_package_type == 'deb' %}
{% set aodh_listener_packages = ['aodh-listener'] %}
{% endif %}
{{ macros.install_packages(aodh_listener_packages | customizable("packages")) }}
{% endif %}
{% block aodh_listener_footer %}{% endblock %}
{% block footer %}{% endblock %}

9
docker/aodh/aodh-notifier/Dockerfile.j2
View File

@ -7,15 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set aodh_notifier_packages = ['openstack-aodh-notifier'] %}
{% elif base_package_type == 'deb' %}
{% set aodh_notifier_packages = ['aodh-notifier'] %}
{% endif %}
{{ macros.install_packages(aodh_notifier_packages | customizable("packages")) }}
{% endif %}
{% block aodh_notifier_footer %}{% endblock %}
{% block footer %}{% endblock %}

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

@ -7,27 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set barbican_api_packages = [
'openstack-barbican-api',
'uwsgi-plugin-python3'
] %}
{{ macros.install_packages(barbican_api_packages | customizable("packages")) }}
{% elif base_package_type == 'deb' %}
{% set barbican_api_packages = [
'barbican-api',
'uwsgi-plugin-python3'
] %}
{{ macros.install_packages(barbican_api_packages | customizable("packages")) }}
{% endif %}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_barbican_extend_start
RUN chmod 755 /usr/local/bin/kolla_barbican_extend_start

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

@ -9,21 +9,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='barbican', groups='nfast') }}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set barbican_base_packages = ['openstack-barbican-common'] %}
{% elif base_package_type == 'deb' %}
{% set barbican_base_packages = ['barbican-common'] %}
{% endif %}
{{ macros.install_packages(barbican_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set barbican_base_packages = ['uwsgi-plugin-python3'] %}
{% elif base_package_type == 'deb' %}
{% set barbican_base_packages = ['uwsgi-plugin-python3'] %}
{% endif %}
{% if base_package_type == 'rpm' %}
{% set barbican_base_packages = ['uwsgi-plugin-python3'] %}
{% elif base_package_type == 'deb' %}
{% set barbican_base_packages = ['uwsgi-plugin-python3'] %}
{% endif %}
{{ macros.install_packages(barbican_base_packages | customizable("packages")) }}
@ -41,8 +31,6 @@ RUN ln -s barbican-base-source/* barbican \
&& cp -r /barbican/etc/barbican/* /etc/barbican/ \
&& chown -R barbican: /etc/barbican
{% endif %}
COPY barbican_sudoers /etc/sudoers.d/kolla_barbican_sudoers
COPY extend_start.sh /usr/local/bin/kolla_extend_start

11
docker/barbican/barbican-keystone-listener/Dockerfile.j2
View File

@ -7,17 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set barbican_keystone_listener_packages = ['openstack-barbican-keystone-listener'] %}
{% elif base_package_type == 'deb' %}
{% set barbican_keystone_listener_packages = ['barbican-keystone-listener'] %}
{% endif %}
{{ macros.install_packages(barbican_keystone_listener_packages | customizable("packages")) }}
{% endif %}
{% block barbican_keystone_listener_footer %}{% endblock %}
{% block footer %}{% endblock %}

11
docker/barbican/barbican-worker/Dockerfile.j2
View File

@ -7,17 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set barbican_worker_packages = ['openstack-barbican-worker'] %}
{% elif base_package_type == 'deb' %}
{% set barbican_worker_packages = ['barbican-worker'] %}
{% endif %}
{{ macros.install_packages(barbican_worker_packages | customizable("packages")) }}
{% endif %}
{% block barbican_worker_footer %}{% endblock %}
{% block footer %}{% endblock %}

7
docker/bifrost/bifrost-base/Dockerfile.j2
View File

@ -12,12 +12,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{# NOTE(mgoddard): EPEL required for nginx #}
{{ macros.enable_extra_repos(['epel']) }}
{% if install_type == 'binary' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' && /bin/false
{% elif install_type == 'source' %}
ENV VENV /var/lib/kolla/venv
{% set bifrost_base_pip_packages = [
@ -49,7 +43,6 @@ RUN echo " " && \
dnf clean all && rm -rf /var/dnf/cache'
{%- endif %}
{% endblock %}
{% endif %}
COPY bifrost_sudoers /etc/sudoers.d/kolla_bifrost_sudoers

7
docker/blazar/blazar-api/Dockerfile.j2
View File

@ -5,13 +5,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block blazar_api_header %}{% endblock %}
{% if install_type == 'binary' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_blazar_extend_start
RUN chmod 755 /usr/local/bin/kolla_blazar_extend_start

9
docker/blazar/blazar-base/Dockerfile.j2
View File

@ -9,13 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='blazar') }}
{% if install_type == 'binary' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% elif install_type == 'source' %}
ADD blazar-base-archive /blazar-base-source
{% set blazar_base_pip_packages = [
@ -28,8 +21,6 @@ RUN ln -s blazar-base-source/* blazar \
&& cp -r /blazar/etc/blazar/* /etc/blazar \
&& chown -R blazar: /etc/blazar
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_blazar_extend_start \

7
docker/blazar/blazar-manager/Dockerfile.j2
View File

@ -5,13 +5,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block blazar_manager_header %}{% endblock %}
{% if install_type == 'binary' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% endif %}
{% block blazar_manager_footer %}{% endblock %}
{% block footer %}{% endblock %}

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

@ -9,25 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='ceilometer') }}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set ceilometer_base_packages = [
'openstack-ceilometer-common',
'python3-gnocchiclient',
'python3-oslo-db',
'python3-tooz'
] %}
{% elif base_package_type == 'deb' %}
{% set ceilometer_base_packages = [
'ceilometer-common',
'python3-gnocchiclient',
] %}
{% endif %}
{{ macros.install_packages(ceilometer_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% set ceilometer_base_pip_packages = [
'/ceilometer'
] %}
@ -50,8 +31,6 @@ RUN ln -s ceilometer-base-source/* ceilometer \
{{ macros.install_pip(ceilometer_base_plugins_pip_packages) }}; \
fi
{% endif %}
COPY ceilometer_sudoers /etc/sudoers.d/kolla_ceilometer_sudoers
COPY extend_start.sh /usr/local/bin/kolla_extend_start

11
docker/ceilometer/ceilometer-central/Dockerfile.j2
View File

@ -7,17 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set ceilometer_central_packages = ['openstack-ceilometer-central'] %}
{% elif base_package_type == 'deb' %}
{% set ceilometer_central_packages = ['ceilometer-agent-central'] %}
{% endif %}
{{ macros.install_packages(ceilometer_central_packages | customizable("packages")) }}
{% endif %}
{% block ceilometer_central_footer %}{% endblock %}
{% block footer %}{% endblock %}

34
docker/ceilometer/ceilometer-compute/Dockerfile.j2
View File

@ -9,29 +9,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.enable_extra_repos(['libvirt']) }}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set ceilometer_compute_packages = [
'openstack-ceilometer-compute',
] %}
{% elif base_package_type == 'deb' %}
{% set ceilometer_compute_packages = [
'ceilometer-agent-compute',
'python3-libvirt'
] %}
{% endif %}
{{ macros.install_packages(ceilometer_compute_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set ceilometer_compute_packages = [
'python3-libvirt'
] %}
{% elif base_package_type == 'deb' %}
{% set ceilometer_compute_packages = [
'python3-libvirt'
] %}
{% endif %}
{% if base_package_type == 'rpm' %}
{% set ceilometer_compute_packages = [
'python3-libvirt'
] %}
{% elif base_package_type == 'deb' %}
{% set ceilometer_compute_packages = [
'python3-libvirt'
] %}
{% endif %}
{{ macros.install_packages(ceilometer_compute_packages | customizable("packages")) }}
@ -40,8 +26,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
RUN {{ macros.install_pip(ceilometer_compute_pip_packages | customizable("pip_packages")) }}
{% endif %}
{% block ceilometer_compute_footer %}{% endblock %}
{% block footer %}{% endblock %}

30
docker/ceilometer/ceilometer-ipmi/Dockerfile.j2
View File

@ -7,28 +7,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set ceilometer_ipmi_packages = [
'openstack-ceilometer-ipmi'
] %}
{% elif base_package_type == 'deb' %}
{% set ceilometer_ipmi_packages = [
'ceilometer-agent-ipmi'
] %}
{% endif %}
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set ceilometer_ipmi_packages = [
'ipmitool'
] %}
{% elif base_package_type == 'deb' %}
{% set ceilometer_ipmi_packages = [
'ipmitool'
] %}
{% endif %}
{% if base_package_type == 'rpm' %}
{% set ceilometer_ipmi_packages = [
'ipmitool'
] %}
{% elif base_package_type == 'deb' %}
{% set ceilometer_ipmi_packages = [
'ipmitool'
] %}
{% endif %}
{{ macros.install_packages(ceilometer_ipmi_packages | customizable("packages")) }}

11
docker/ceilometer/ceilometer-notification/Dockerfile.j2
View File

@ -7,17 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set ceilometer_notification_packages = ['openstack-ceilometer-notification'] %}
{% elif base_package_type == 'deb' %}
{% set ceilometer_notification_packages = ['ceilometer-agent-notification'] %}
{% endif %}
{{ macros.install_packages(ceilometer_notification_packages | customizable("packages")) }}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_ceilometer_extend_start
RUN chmod 755 /usr/local/bin/kolla_ceilometer_extend_start

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

@ -7,30 +7,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set cinder_api_packages = [
] %}
{% elif base_package_type == 'deb' %}
{% set cinder_api_packages = [
'cinder-api'
] %}
{% endif %}
{{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/cinder \
&& cp -a /usr/bin/cinder-wsgi /var/www/cgi-bin/cinder/cinder-wsgi
{% elif install_type == 'source' %}
{% set cinder_api_packages = [
] %}
{% set cinder_api_packages = [
] %}
{{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/cinder \
&& cp -a /var/lib/kolla/venv/bin/cinder-wsgi /var/www/cgi-bin/cinder/cinder-wsgi
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_cinder_extend_start
RUN chmod 755 /usr/local/bin/kolla_cinder_extend_start \
&& chown -R cinder: /var/www/cgi-bin/cinder \

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

@ -7,29 +7,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set cinder_backup_packages = [
'nfs-utils'
] %}
{% elif base_package_type == 'deb' %}
{% set cinder_backup_packages = [
'cinder-backup',
'nfs-common'
] %}
{% endif %}
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set cinder_backup_packages = [
'nfs-utils'
] %}
{% elif base_package_type == 'deb' %}
{% set cinder_backup_packages = [
'nfs-common'
] %}
{% endif %}
{% if base_package_type == 'rpm' %}
{% set cinder_backup_packages = [
'nfs-utils'
] %}
{% elif base_package_type == 'deb' %}
{% set cinder_backup_packages = [
'nfs-common'
] %}
{% endif %}
{{ macros.install_packages(cinder_backup_packages | customizable("packages")) }}

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

@ -11,49 +11,24 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.enable_extra_repos(['ceph']) }}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set cinder_base_packages = [
'ceph-common',
'lvm2',
'cryptsetup',
'openstack-cinder',
'python3-automaton',
'python3-oslo-vmware'
] %}
{% elif base_package_type == 'deb' %}
{% set cinder_base_packages = [
'ceph-common',
'cinder-common',
'lvm2',
'cryptsetup',
'python3-cephfs',
'python3-oslo.vmware',
'python3-rados',
'python3-rbd'
] %}
{% endif %}
{{ macros.install_packages(cinder_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set cinder_base_packages = [
'ceph-common',
'cryptsetup',
'lvm2',
'qemu-img'
] %}
{% elif base_package_type == 'deb' %}
{% set cinder_base_packages = [
'ceph-common',
'lvm2',
'cryptsetup',
'python3-cephfs',
'python3-rados',
'python3-rbd',
'qemu-utils'
] %}
{% endif %}
{% if base_package_type == 'rpm' %}
{% set cinder_base_packages = [
'ceph-common',
'cryptsetup',
'lvm2',
'qemu-img'
] %}
{% elif base_package_type == 'deb' %}
{% set cinder_base_packages = [
'ceph-common',
'lvm2',
'cryptsetup',
'python3-cephfs',
'python3-rados',
'python3-rbd',
'qemu-utils'
] %}
{% endif %}
{{ macros.install_packages(cinder_base_packages | customizable("packages")) }}
{% set cinder_base_pip_packages = [
@ -68,8 +43,6 @@ RUN ln -s cinder-base-source/* cinder \
&& chown -R cinder: /etc/cinder \
&& sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/cinder/rootwrap.conf
{% endif %}
COPY cinder_sudoers /etc/sudoers.d/kolla_cinder_sudoers
COPY extend_start.sh /usr/local/bin/kolla_extend_start

11
docker/cinder/cinder-scheduler/Dockerfile.j2
View File

@ -7,17 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'deb' %}
{% set cinder_scheduler_packages = [
'cinder-scheduler'
] %}
{{ macros.install_packages(cinder_scheduler_packages | customizable("packages")) }}
{% endif %}
{% endif %}
{% block cinder_scheduler_footer %}{% endblock %}
{% block footer %}{% endblock %}

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

@ -9,34 +9,21 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %}
{% set cinder_volume_packages = [
'nfs-utils',
'nvmetcli',
'sysfsutils',
'targetcli'
'nfs-utils',
'nvmetcli',
'sysfsutils',
'targetcli'
] %}
{% if install_type == 'binary' %}
{% set cinder_volume_packages = cinder_volume_packages + [
'python3-rtslib'
] %}
{% endif %}
{% elif base_package_type == 'deb' %}
{% set cinder_volume_packages = [
'lsscsi',
'nfs-common',
'nvme-cli',
'sysfsutils',
'targetcli-fb',
'thin-provisioning-tools',
'tgt'
'lsscsi',
'nfs-common',
'nvme-cli',
'sysfsutils',
'targetcli-fb',
'thin-provisioning-tools',
'tgt'
] %}
{% if install_type == 'binary' %}
{% set cinder_volume_packages = cinder_volume_packages + [
'cinder-volume',
'python3-rtslib-fb'
] %}
{% endif %}
{% endif %}
{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}

19
docker/cloudkitty/cloudkitty-api/Dockerfile.j2
View File

@ -7,23 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set cloudkitty_api_packages = [
'openstack-cloudkitty-api'
] %}
{% elif base_package_type == 'deb' %}
{% set cloudkitty_api_packages = [
'cloudkitty-api'
] %}
{% endif %}
{% elif install_type == 'source' %}
{% set cloudkitty_api_packages = [
] %}
{% endif %}
{% set cloudkitty_api_packages = [
] %}
{{ macros.install_packages(cloudkitty_api_packages | customizable("packages")) }}

21
docker/cloudkitty/cloudkitty-base/Dockerfile.j2
View File

@ -9,25 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='cloudkitty') }}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set cloudkitty_base_packages = [
'openstack-cloudkitty-common',
] %}
{% elif base_package_type == 'deb' %}
{% set cloudkitty_base_packages = [
'cloudkitty-common',
] %}
{% endif %}
{{ macros.install_packages(cloudkitty_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% set cloudkitty_base_pip_packages = [
'/cloudkitty'
] %}
@ -39,8 +20,6 @@ RUN ln -s cloudkitty-base-source/* cloudkitty \
&& cp -r /cloudkitty/etc/cloudkitty/* /etc/cloudkitty/ \
&& chown -R cloudkitty: /etc/cloudkitty
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_cloudkitty_extend_start \

18
docker/cloudkitty/cloudkitty-processor/Dockerfile.j2
View File

@ -7,22 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set cloudkitty_processor_packages = [
'openstack-cloudkitty-processor',
] %}
{% elif base_package_type == 'deb' %}
{% set cloudkitty_processor_packages = [
'cloudkitty-processor',
] %}
{% endif %}
{% endif %}
{% set cloudkitty_processor_packages = [
] %}
{{ macros.install_packages(cloudkitty_processor_packages | customizable("packages")) }}

12
docker/cyborg/cyborg-api/Dockerfile.j2
View File

@ -6,17 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block cyborg_api_header %}{% endblock %}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% elif install_type == 'source' %}
{% set cyborg_api_packages = [
] %}
{% set cyborg_api_packages = [
] %}
{{ macros.install_packages(cyborg_api_packages | customizable("packages")) }}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_cyborg_extend_start
RUN chmod 755 /usr/local/bin/kolla_cyborg_extend_start

9
docker/cyborg/cyborg-base/Dockerfile.j2
View File

@ -9,13 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='cyborg') }}
{% if install_type == 'binary' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% elif install_type == 'source' %}
ADD cyborg-base-archive /cyborg-base-source
{% set cyborg_base_pip_packages = [
@ -27,8 +20,6 @@ RUN ln -s cyborg-base-source/* cyborg \
&& mkdir -p /etc/cyborg/ \
&& cp -r /cyborg/etc/cyborg/* /etc/cyborg/
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
COPY cyborg_sudoers /etc/sudoers.d/kolla_cyborg_sudoers

9
docker/designate/designate-api/Dockerfile.j2
View File

@ -7,15 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set designate_api_packages = ['openstack-designate-api'] %}
{% elif base_package_type == 'deb' %}
{% set designate_api_packages = ['designate-api'] %}
{% endif %}
{{ macros.install_packages(designate_api_packages | customizable("packages")) }}
{% endif %}
{% block designate_api_footer %}{% endblock %}
{% block footer %}{% endblock %}

22
docker/designate/designate-base/Dockerfile.j2
View File

@ -9,27 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='designate') }}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set designate_base_packages = [
'openstack-designate-common',
'python3-oslo-reports',
'python3-suds',
'python3-tooz'
] %}
{{ macros.install_packages(designate_base_packages | customizable("packages")) }}
{% elif base_package_type == 'deb' %}
{% set designate_base_packages = [
'designate-common',
'python3-tooz'
] %}
{{ macros.install_packages(designate_base_packages | customizable("packages")) }}
{% endif %}
{% elif install_type == 'source' %}
{% set designate_base_pip_packages = [
'/designate'
] %}
@ -42,7 +21,6 @@ RUN ln -s designate-base-source/* designate \
&& mv /etc/designate/rootwrap.conf.sample /etc/designate/rootwrap.conf \
&& chown -R designate: /etc/designate \
&& sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/designate/rootwrap.conf
{% endif %}
COPY designate_sudoers /etc/sudoers.d/kolla_designate_sudoers
COPY extend_start.sh /usr/local/bin/kolla_extend_start

9
docker/designate/designate-central/Dockerfile.j2
View File

@ -7,15 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set designate_central_packages = ['openstack-designate-central'] %}
{% elif base_package_type == 'deb'%}
{% set designate_central_packages = ['designate-central'] %}
{% endif %}
{{ macros.install_packages(designate_central_packages | customizable("packages")) }}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_designate_extend_start
RUN chmod 755 /usr/local/bin/kolla_designate_extend_start

9
docker/designate/designate-mdns/Dockerfile.j2
View File

@ -7,15 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set designate_mdns_packages = ['openstack-designate-mdns'] %}
{% elif base_package_type == 'deb' %}
{% set designate_mdns_packages = ['designate-mdns'] %}
{% endif %}
{{ macros.install_packages(designate_mdns_packages | customizable("packages")) }}
{% endif %}
{% block designate_mdns_footer %}{% endblock %}
{% block footer %}{% endblock %}

9
docker/designate/designate-producer/Dockerfile.j2
View File

@ -7,15 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set designate_producer_packages = ['openstack-designate-producer'] %}
{% elif base_package_type == 'deb' %}
{% set designate_producer_packages = ['designate-producer'] %}
{% endif %}
{{ macros.install_packages(designate_producer_packages | customizable("packages")) }}
{% endif %}
{% block designate_producer_footer %}{% endblock %}
{% block footer %}{% endblock %}

15
docker/designate/designate-sink/Dockerfile.j2
View File

@ -7,21 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set designate_sink_packages = [
'openstack-designate-sink',
'python3-designateclient'
] %}
{% elif base_package_type == 'deb' %}
{% set designate_sink_packages = [
'designate-sink',
'python3-designateclient'
] %}
{% endif %}
{{ macros.install_packages(designate_sink_packages | customizable("packages")) }}
{% endif %}
{% block designate_sink_footer %}{% endblock %}
{% block footer %}{% endblock %}

30
docker/designate/designate-worker/Dockerfile.j2
View File

@ -8,28 +8,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
# The bind9 package here is only to provide the rndc binary.
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set designate_worker_packages = [
'bind',
'openstack-designate-worker'
] %}
{% elif base_package_type == 'deb' %}
{% set designate_worker_packages = [
'bind9',
'designate-worker'
] %}
{% endif %}
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set designate_worker_packages = [
'bind'
] %}
{% elif base_package_type == 'deb' %}
{% set designate_worker_packages = [
'bind9'
] %}
{% endif %}
{% if base_package_type == 'rpm' %}
{% set designate_worker_packages = [
'bind'
] %}
{% elif base_package_type == 'deb' %}
{% set designate_worker_packages = [
'bind9'
] %}
{% endif %}
{{ macros.install_packages(designate_worker_packages | customizable("packages")) }}

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

@ -7,15 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% elif install_type == 'source' %}
{% set freezer_api_packages = [
] %}
{% set freezer_api_packages = [
] %}
{{ macros.install_packages(freezer_api_packages | customizable("packages")) }}
@ -29,8 +22,6 @@ RUN ln -s freezer-api-source/* freezer-api \
&& {{ macros.install_pip(freezer_api_pip_packages | customizable("pip_packages")) }} \
&& cp -r /freezer-api/etc/freezer/* /etc/freezer/
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_freezer_extend_start
RUN chmod 755 /usr/local/bin/kolla_freezer_extend_start

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

@ -9,18 +9,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='freezer') }}
{% if install_type == 'binary' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% elif install_type == 'source' %}
{% if base_package_type == 'deb' %}
{% set freezer_base_packages = [
'trickle'
] %}
{% if base_package_type == 'deb' %}
{% set freezer_base_packages = [
'trickle'
] %}
{{ macros.install_packages(freezer_base_packages | customizable("packages")) }}
{% endif %}
{% endif %}
ADD freezer-base-archive /freezer-base-source
@ -34,8 +28,6 @@ RUN ln -s freezer-base-source/* freezer \
&& {{ macros.install_pip(freezer_base_pip_packages | customizable("pip_packages")) }} \
&& cp -r /freezer/etc/* /etc/freezer
{% endif %}
COPY freezer_sudoers /etc/sudoers.d/kolla_freezer_sudoers
COPY extend_start.sh /usr/local/bin/kolla_extend_start

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

@ -11,46 +11,18 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.enable_extra_repos(['ceph']) }}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set glance_base_packages = [
'openstack-glance',
'python3-boto3',
'python3-oslo-vmware',
'python3-rados',
'python3-rbd'
] %}
{% elif base_package_type == 'deb' %}
{% set glance_base_packages = [
'glance',
'python3-boto3',
'python3-os-brick',
'python3-oslo.vmware',
'python3-rados',
'python3-rbd',
] %}
{% endif %}
{{ macros.install_packages(glance_base_packages | customizable("packages")) }}
{% if base_package_type == 'deb' %}
# fix up Ubuntu and Debian packaging of config (glance_store's rootwrap)
RUN ln -s /etc/glance/glance/* /etc/glance/
{% if base_package_type == 'rpm' %}
{% set glance_base_packages = [
'python3-rados',
'python3-rbd'
] %}
{% elif base_package_type == 'deb' %}
{% set glance_base_packages = [
'python3-rados',
'python3-rbd'
] %}
{% endif %}
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set glance_base_packages = [
'python3-rados',
'python3-rbd'
] %}
{% elif base_package_type == 'deb' %}
{% set glance_base_packages = [
'python3-rados',
'python3-rbd'
] %}
{% endif %}
{{ macros.install_packages(glance_base_packages | customizable("packages")) }}
ADD glance-base-archive /glance-base-source
@ -70,8 +42,6 @@ RUN ln -s glance-base-source/* glance \
&& chown -R glance: /etc/glance \
&& sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/glance/rootwrap.conf
{% endif %}
COPY glance_sudoers /etc/sudoers.d/kolla_glance_sudoers
COPY extend_start.sh /usr/local/bin/kolla_extend_start

16
docker/gnocchi/gnocchi-api/Dockerfile.j2
View File

@ -7,22 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set gnocchi_api_packages = [
'gnocchi-api',
'gnocchi-common'
] %}
{% elif base_package_type == 'deb' %}
{% set gnocchi_api_packages = ['gnocchi-api'] %}
{% endif %}
{{ macros.install_packages(gnocchi_api_packages | customizable("packages")) }}
{% if base_package_type == 'deb' %}
RUN rm -rf /etc/apache2/sites-enabled/gnocchi-api.conf
{% endif %}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_gnocchi_extend_start
RUN chmod 755 /usr/local/bin/kolla_gnocchi_extend_start

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

@ -11,53 +11,26 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.enable_extra_repos(['ceph']) }}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{# NOTE(mgoddard): EPEL required for python3-boto3 package on CentOS 8 #}
{{ macros.enable_extra_repos(['epel']) }}
{% set gnocchi_base_packages = [
'librados2-devel',
'python3-rados',
] %}
{% if base_package_type == 'rpm' %}
{% set gnocchi_base_packages = [
'gnocchi-common',
'python3-boto3',
'python3-rados',
] %}
{% elif base_package_type == 'deb' %}
{% set gnocchi_base_packages = [
'build-essential',
'gnocchi-common',
'librados-dev',
'python3-boto3',
'python3-dev',
'python3-rados',
'python3-setuptools',
'python3-wheel'
] %}
{% endif %}
{{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set gnocchi_base_packages = [
'librados2-devel',
'python3-rados',
] %}
{{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/gnocchi
{% elif base_package_type == 'deb' %}
{% elif base_package_type == 'deb' %}
{% set gnocchi_base_packages = [
'librados-dev',
'python3-rados',
] %}
{% set gnocchi_base_packages = [
'librados-dev',
'python3-rados',
] %}
{% endif %}
{{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}
{% endif %}
ADD gnocchi-base-archive /gnocchi-base-source
{% set gnocchi_base_pip_packages = [
@ -70,8 +43,6 @@ RUN ln -s gnocchi-base-source/* gnocchi \
&& mkdir -p /etc/gnocchi \
&& chown -R gnocchi: /etc/gnocchi
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
COPY gnocchi_sudoers /etc/sudoers.d/kolla_gnocchi_sudoers

5
docker/gnocchi/gnocchi-metricd/Dockerfile.j2
View File

@ -7,11 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% set gnocchi_metricd_packages = ['gnocchi-metricd'] %}
{{ macros.install_packages(gnocchi_metricd_packages | customizable("packages")) }}
{% endif %}
{% block gnocchi_metricd_footer %}{% endblock %}
{% block footer %}{% endblock %}

5
docker/gnocchi/gnocchi-statsd/Dockerfile.j2
View File

@ -7,11 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% set gnocchi_statsd_packages = ['gnocchi-statsd'] %}
{{ macros.install_packages(gnocchi_statsd_packages | customizable("packages")) }}
{% endif %}
{% block gnocchi_statsd_footer %}{% endblock %}
{% block footer %}{% endblock %}

9
docker/heat/heat-api-cfn/Dockerfile.j2
View File

@ -7,15 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set heat_api_cfn_packages = ['openstack-heat-api-cfn'] %}
{% elif base_package_type == 'deb' %}
{% set heat_api_cfn_packages = ['heat-api-cfn'] %}
{% endif %}
{{ macros.install_packages(heat_api_cfn_packages | customizable("packages")) }}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_heat_extend_start
RUN chmod 755 /usr/local/bin/kolla_heat_extend_start

9
docker/heat/heat-api/Dockerfile.j2
View File

@ -7,15 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set heat_api_packages = ['openstack-heat-api'] %}
{% elif base_package_type == 'deb' %}
{% set heat_api_packages = ['heat-api'] %}
{% endif %}
{{ macros.install_packages(heat_api_packages | customizable("packages")) }}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_heat_extend_start
RUN chmod 755 /usr/local/bin/kolla_heat_extend_start

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

@ -10,24 +10,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.enable_extra_repos(['openvswitch']) }}
{{ macros.configure_user(name='heat') }}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set heat_base_packages = [
'openstack-heat-common'
] %}
{{ macros.install_packages(heat_base_packages | customizable("packages")) }}
{% elif base_package_type == 'deb' %}
{% set heat_base_packages = [
'heat-common'
] %}
{{ macros.install_packages(heat_base_packages | customizable("packages")) }}
{% endif %}
{% elif install_type == 'source' %}
{% set heat_base_packages = [
] %}
{% set heat_base_packages = [
] %}
{{ macros.install_packages(heat_base_packages | customizable("packages")) }}
@ -43,8 +27,6 @@ RUN ln -s heat-base-source/* heat \
&& cp -r /heat/etc/heat/* /etc/heat/ \
&& chown -R heat: /etc/heat
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_heat_extend_start \

18
docker/heat/heat-engine/Dockerfile.j2
View File

@ -7,24 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set heat_engine_packages = [
'openstack-heat-engine',
'python3-barbicanclient',
] %}
{% elif base_package_type == 'deb' %}
{# TODO(mnasiadka): Remove extra clients once bug 1893935 is solved in UCA #}
{# bug: https://bugs.launchpad.net/cloud-archive/+bug/1893935 #}
{% set heat_engine_packages = [
'heat-engine',
'python3-vitrageclient',
'python3-zunclient',
] %}
{% endif %}
{{ macros.install_packages(heat_engine_packages | customizable("packages")) }}
{% endif %}
{% block heat_engine_footer %}{% endblock %}
{% block footer %}{% endblock %}

118
docker/horizon/Dockerfile.j2
View File

@ -10,112 +10,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.enable_extra_repos(['powertools']) }}
{{ macros.configure_user(name='horizon') }}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set horizon_packages = [
'gettext',
'openstack-cloudkitty-ui',
'openstack-dashboard',
'openstack-designate-ui',
'openstack-heat-ui',
'openstack-ironic-ui',
'openstack-magnum-ui',
'openstack-manila-ui',
'openstack-mistral-ui',
'openstack-murano-ui',
'openstack-octavia-ui',
'openstack-sahara-ui',
'openstack-trove-ui',
'openstack-vitrage-ui',
] %}
{% if base_package_type == 'rpm' %}
{% set horizon_packages = [
'gettext'
] %}
{{ macros.install_packages(horizon_packages | customizable("packages")) }}
{% elif base_package_type == 'deb' %}
{% block horizon_redhat_binary_setup %}
RUN ln -s /usr/share/openstack-dashboard/openstack_dashboard /usr/lib/python{{ distro_python_version }}/site-packages/openstack_dashboard \
&& ln -s /usr/share/openstack-dashboard/static /usr/lib/python{{ distro_python_version }}/site-packages/static \
&& chown -R horizon: /etc/openstack-dashboard /usr/share/openstack-dashboard \
&& chown -R apache: /usr/share/openstack-dashboard/static \
&& sed -i "s|WEBROOT = '/dashboard/'|WEBROOT = '/'|" /etc/openstack-dashboard/local_settings \
&& cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \
&& rm -f /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/?[^_]*.py* \
&& rm -f /usr/lib/python{{ distro_python_version }}/site-packages/openstack_dashboard/local/enabled/?[^_]*.py* \
&& for locale in /usr/lib/python{{ distro_python_version }}/site-packages/*/locale; do \
(cd ${locale%/*} && /usr/bin/django-admin compilemessages) \
done
{% endblock %}
{% elif base_package_type == 'deb' %}
{% set horizon_packages = [
'gettext',
'locales',
'openstack-dashboard',
'python3-cloudkitty-dashboard',
'python3-designate-dashboard',
'python3-freezer-web-ui',
'python3-heat-dashboard',
'python3-ironic-ui',
'python3-magnum-ui',
'python3-manila-ui',
'python3-mistral-dashboard',
'python3-murano-dashboard',
'python3-neutron-vpnaas-dashboard',
'python3-octavia-dashboard',
'python3-sahara-dashboard',
'python3-senlin-dashboard',
'python3-trove-dashboard',
'python3-vitrage-dashboard',
'python3-watcher-dashboard',
'tzdata',
] %}
{% if base_distro == 'debian' %}
{% set horizon_packages = horizon_packages + [
'python3-masakari-dashboard',
] %}
{% endif %}
{{ macros.install_packages(horizon_packages | customizable("packages")) }}
{% block horizon_ubuntu_binary_setup %}
RUN sed -i 's|\(ServerTokens \)OS|\1Prod|' /etc/apache2/conf-available/security.conf \
&& ln -s ../mods-available/headers.load /etc/apache2/mods-enabled/headers.load \
&& ln -s ../mods-available/expires.load /etc/apache2/mods-enabled/expires.load \
{% if base_distro == 'ubuntu' %}
&& cp -r /usr/share/openstack-dashboard/openstack_dashboard/conf/* /etc/openstack-dashboard \
&& rm /etc/apache2/conf-enabled/openstack-dashboard.conf \
{% else %}
&& cp -r /etc/openstack-dashboard/policy/* /etc/openstack-dashboard \
{% endif %}
&& cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \
&& rm /etc/openstack-dashboard/local_settings.py \
&& ln -s /etc/openstack-dashboard/local_settings /etc/openstack-dashboard/local_settings.py \
&& for locale in /usr/lib/python3/dist-packages/*/locale; do \
(cd ${locale%/*} && /usr/bin/django-admin compilemessages) \
done {% if install_type == 'binary' and base_distro == 'debian' %} \
&& rm -rf /etc/openstack-dashboard/enabled/* \
/etc/openstack-dashboard/local_settings.d/* \
/usr/lib/python3/dist-packages/openstack_dashboard/conf \
&& mv /etc/openstack-dashboard/policy /usr/lib/python3/dist-packages/openstack_dashboard/conf
{% endif %}
{% endblock %}
{% endif %}
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set horizon_packages = [
'gettext'
] %}
{{ macros.install_packages(horizon_packages | customizable("packages")) }}
{% elif base_package_type == 'deb' %}
{% set horizon_packages = [
'gettext',
'locales',
'tzdata'
] %}
{% set horizon_packages = [
'gettext',
'locales',
'tzdata'
] %}
{{ macros.install_packages(horizon_packages | customizable("packages")) }}
@ -123,7 +31,7 @@ RUN sed -i 's|\(ServerTokens \)OS|\1Prod|' /etc/apache2/conf-available/security.
RUN ln -s ../mods-available/headers.load /etc/apache2/mods-enabled/headers.load
{% endblock %}
{% endif %}
{% endif %}
ADD horizon-archive /horizon-source
ADD plugins-archive /
@ -152,8 +60,6 @@ RUN ln -s horizon-source/* horizon \
done \
&& chown -R horizon: /etc/openstack-dashboard
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start

24
docker/horizon/extend_start.sh
View File

@ -5,15 +5,7 @@ set -o errexit
FORCE_GENERATE="${FORCE_GENERATE:-no}"
HASH_PATH=/var/lib/kolla/.settings.md5sum.txt
if [[ ${KOLLA_INSTALL_TYPE} == "binary" ]]; then
if [[ ${KOLLA_BASE_DISTRO} == "debian" ]] || [[ ${KOLLA_BASE_DISTRO} == "ubuntu" ]]; then
SITE_PACKAGES="/usr/lib/python3/dist-packages"
else
SITE_PACKAGES="/usr/lib/python${KOLLA_DISTRO_PYTHON_VERSION}/site-packages"
fi
elif [[ ${KOLLA_INSTALL_TYPE} == "source" ]]; then
SITE_PACKAGES="/var/lib/kolla/venv/lib/python${KOLLA_DISTRO_PYTHON_VERSION}/site-packages"
fi
SITE_PACKAGES="/var/lib/kolla/venv/lib/python${KOLLA_DISTRO_PYTHON_VERSION}/site-packages"
if [[ -f "/var/lib/kolla/venv/bin/python" ]]; then
MANAGE_PY="/var/lib/kolla/venv/bin/python /var/lib/kolla/venv/bin/manage.py"
@ -21,20 +13,13 @@ else
MANAGE_PY="/usr/bin/python${KOLLA_DISTRO_PYTHON_VERSION} /usr/bin/manage.py"
fi
if [[ ${KOLLA_INSTALL_TYPE} == "source" ]] && [[ ! -f ${SITE_PACKAGES}/openstack_dashboard/local/local_settings.py ]]; then
ln -s /etc/openstack-dashboard/local_settings \
${SITE_PACKAGES}/openstack_dashboard/local/local_settings.py
elif [[ ${KOLLA_BASE_DISTRO} == "debian" ]] && [[ ${KOLLA_INSTALL_TYPE} == "binary" ]]; then
rm -f ${SITE_PACKAGES}/openstack_dashboard/local/local_settings.py
if [[ ! -f ${SITE_PACKAGES}/openstack_dashboard/local/local_settings.py ]]; then
ln -s /etc/openstack-dashboard/local_settings \
${SITE_PACKAGES}/openstack_dashboard/local/local_settings.py
fi
if [[ -f /etc/openstack-dashboard/custom_local_settings ]]; then
CUSTOM_SETTINGS_FILE="${SITE_PACKAGES}/openstack_dashboard/local/custom_local_settings.py"
if [[ ${KOLLA_INSTALL_TYPE} == "binary" ]] && [[ "${KOLLA_BASE_DISTRO}" =~ ubuntu ]]; then
CUSTOM_SETTINGS_FILE="/usr/share/openstack-dashboard/openstack_dashboard/local/custom_local_settings.py"
fi
if [[ ! -L ${CUSTOM_SETTINGS_FILE} ]]; then
ln -s /etc/openstack-dashboard/custom_local_settings ${CUSTOM_SETTINGS_FILE}
@ -336,8 +321,3 @@ if [[ -f ${SITE_PACKAGES}/openstack_dashboard/local/.secret_key_store ]] && [[ $
fi
. /usr/local/bin/kolla_httpd_setup
if [[ "${KOLLA_BASE_DISTRO}" == "debian" ]] && [[ ${KOLLA_INSTALL_TYPE} == "binary" ]]; then
APACHE_RUN_GROUP=horizon
APACHE_RUN_USER=horizon
fi

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

@ -9,28 +9,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='ironic-inspector') }}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set ironic_inspector_packages = [
'iptables',
'openstack-ironic-inspector',
'openstack-ironic-inspector-dnsmasq'
] %}
{% elif base_package_type == 'deb' %}
{% set ironic_inspector_packages = [
'iptables',
'ironic-inspector'
] %}
{% endif %}
{{ macros.install_packages(ironic_inspector_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set ironic_inspector_packages = ['iptables'] %}
{% elif base_package_type == 'deb' %}
{% set ironic_inspector_packages = ['iptables'] %}
{% endif %}
{% if base_package_type == 'rpm' %}
{% set ironic_inspector_packages = ['iptables'] %}
{% elif base_package_type == 'deb' %}
{% set ironic_inspector_packages = ['iptables'] %}
{% endif %}
{{ macros.install_packages(ironic_inspector_packages | customizable("packages")) }}
@ -51,8 +34,6 @@ ADD ironic_inspector_sudoers /etc/sudoers.d/kolla_ironic_inspector_sudoers
RUN chmod 750 /etc/sudoers.d \
&& chmod 440 /etc/sudoers.d/kolla_ironic_inspector_sudoers
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start \

18
docker/ironic/ironic-api/Dockerfile.j2
View File

@ -7,23 +7,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set ironic_api_packages = [
'openstack-ironic-api'
] %}
{% elif base_package_type == 'deb' %}
{% set ironic_api_packages = [
'ironic-api'
] %}
{% endif %}
{% set ironic_api_packages = [
] %}
{{ macros.install_packages(ironic_api_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% set ironic_api_packages = [
] %}
{{ macros.install_packages(ironic_api_packages | customizable("packages")) }}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_ironic_extend_start
RUN chmod 755 /usr/local/bin/kolla_ironic_extend_start

13
docker/ironic/ironic-base/Dockerfile.j2
View File

@ -9,17 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='ironic') }}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set ironic_base_packages = ['openstack-ironic-common'] %}
{% elif base_package_type == 'deb' %}
{% set ironic_base_packages = ['ironic-common'] %}
{% endif %}
{{ macros.install_packages(ironic_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
ADD ironic-base-archive /ironic-base-source
{% set ironic_base_pip_packages = [
@ -37,8 +26,6 @@ ADD ironic_sudoers /etc/sudoers.d/kolla_ironic_sudoers
RUN chmod 750 /etc/sudoers.d \
&& chmod 440 /etc/sudoers.d/kolla_ironic_sudoers
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_ironic_extend_start \

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

@ -7,90 +7,39 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
# TODO(Jeffrey4l): no python-oneviewclient
{% set ironic_conductor_packages = [
'dosfstools',
'e2fsprogs',
'gdisk',
'ipmitool',
'openssh-clients',
'openstack-ironic-conductor',
'openstack-ironic-staging-drivers',
'parted',
'psmisc',
'python3dist\(ansible\)',
'python3-dracclient',
'python3-ironic-inspector-client',
'python3-proliantutils',
'python3-pysnmp',
'python3-scciclient',
'python3-sushy',
'python3-systemd',
'qemu-img',
'util-linux',
'xfsprogs'
] %}
{% elif base_package_type == 'deb' %}
# TODO(jeffrey4l): no python-dracclient, python-oneviewclient,
# python-sushy, ironic-staging-drivers
{% set ironic_conductor_packages = [
'ansible',
'bsdmainutils',
'dosfstools',
'e2fsprogs',
'gdisk',
'ipmitool',
'ironic-conductor',
'openssh-client',
'parted',
'psmisc',
'python3-ironic-inspector-client',
'python3-proliantutils',
'python3-pysnmp4',
'python3-scciclient',
'python3-systemd',
'qemu-utils',
'shellinabox',
'udev',
'xfsprogs',
] %}
{% endif %}
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set ironic_conductor_packages = [
'dosfstools',
'e2fsprogs',
'fuse',
'gdisk',
'ipmitool',
'openssh-clients',
'parted',
'psmisc',
'python3-systemd',
'qemu-img',
'systemd-udev',
'util-linux',
'xfsprogs',
] %}
{% elif base_package_type == 'deb' %}
{% set ironic_conductor_packages = [
'bsdmainutils',
'dosfstools',
'e2fsprogs',
'gdisk',
'ipmitool',
'openssh-client',
'parted',
'psmisc',
'python3-systemd',
'qemu-utils',
'shellinabox',
'udev',
'xfsprogs',
] %}
{% endif %}
{% if base_package_type == 'rpm' %}
{% set ironic_conductor_packages = [
'dosfstools',
'e2fsprogs',
'fuse',
'gdisk',
'ipmitool',
'openssh-clients',
'parted',
'psmisc',
'python3-systemd',
'qemu-img',
'systemd-udev',
'util-linux',
'xfsprogs',
] %}
{% elif base_package_type == 'deb' %}
{% set ironic_conductor_packages = [
'bsdmainutils',
'dosfstools',
'e2fsprogs',
'gdisk',
'ipmitool',
'openssh-client',
'parted',
'psmisc',
'python3-systemd',
'qemu-utils',
'shellinabox',
'udev',
'xfsprogs',
] %}
{% endif %}
{% set ironic_conductor_pip_packages = [
'-r /ironic/driver-requirements.txt',
@ -98,7 +47,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %}
RUN {{ macros.install_pip(ironic_conductor_pip_packages | customizable("pip_packages")) }}
{% endif %}
{{ macros.install_packages(ironic_conductor_packages | customizable("packages")) }}

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

@ -9,58 +9,25 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='keystone') }}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set keystone_base_packages = [
'mod_auth_mellon',
'mod_auth_openidc',
'openstack-keystone',
'python3-ldappool'
] %}
{% if base_package_type == 'rpm' %}
{% set keystone_base_packages = [
'cyrus-sasl-devel',
'mod_auth_mellon',
'mod_auth_openidc',
'openldap-devel',
] %}
RUN dnf module enable mod_auth_openidc -y
{% elif base_package_type == 'deb' %}
{% set keystone_base_packages = [
'libapache2-mod-auth-mellon',
'libapache2-mod-auth-openidc',
'libldap2-dev',
'libsasl2-dev',
] %}
{% endif %}
{{ macros.install_packages(keystone_base_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/keystone \
&& cp -a /usr/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main \
&& cp -a /usr/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin
{% elif base_package_type == 'deb' %}
{% set keystone_base_packages = [
'keystone',
'libapache2-mod-auth-mellon',
'libapache2-mod-auth-openidc',
'python3-ldappool'
] %}
{{ macros.install_packages(keystone_base_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/keystone \
&& cp -a /usr/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main \
&& cp -a /usr/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin \
&& rm -f /etc/apache2/sites-enabled/keystone.conf
{% endif %}
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set keystone_base_packages = [
'cyrus-sasl-devel',
'mod_auth_mellon',
'mod_auth_openidc',
'openldap-devel',
] %}
RUN dnf module enable mod_auth_openidc -y
{{ macros.install_packages(keystone_base_packages | customizable("packages")) }}
{% elif base_package_type == 'deb' %}
{% set keystone_base_packages = [
'libapache2-mod-auth-mellon',
'libapache2-mod-auth-openidc',
'libldap2-dev',
'libsasl2-dev',
] %}
{{ macros.install_packages(keystone_base_packages | customizable("packages")) }}
{% endif %}
{% block keystone_source_install %}
ADD keystone-base-archive /keystone-base-source
@ -78,8 +45,6 @@ RUN ln -s keystone-base-source/* keystone \
&& chown -R keystone: /etc/keystone /var/www/cgi-bin/keystone
{% endblock %}
{% endif %}
RUN chown -R keystone: /var/www/cgi-bin/keystone \
&& chmod 755 /var/www/cgi-bin/keystone/*

34
docker/keystone/keystone/Dockerfile.j2
View File

@ -11,29 +11,15 @@ COPY keystone_bootstrap.sh /usr/local/bin/kolla_keystone_bootstrap
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bootstrap
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set keystone_packages = [
'mod_auth_gssapi',
'python3-requests-kerberos'
] %}
{% elif base_package_type == 'deb' %}
{% set keystone_packages = [
'libapache2-mod-auth-gssapi',
'python3-requests-kerberos',
] %}
{% endif %}
{{ macros.install_packages(keystone_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set keystone_packages = [
'mod_auth_gssapi',
] %}
{% elif base_package_type == 'deb' %}
{% set keystone_packages = [
'libapache2-mod-auth-gssapi',
] %}
{% endif %}
{% if base_package_type == 'rpm' %}
{% set keystone_packages = [
'mod_auth_gssapi',
] %}
{% elif base_package_type == 'deb' %}
{% set keystone_packages = [
'libapache2-mod-auth-gssapi',
] %}
{% endif %}
{{ macros.install_packages(keystone_packages | customizable("packages")) }}
ADD plugins-archive /
@ -46,7 +32,5 @@ RUN if [ "$(ls /plugins)" ]; then \
{{ macros.install_pip(keystone_plugins_pip_packages) }}; \
fi
{% endif %}
{% block keystone_footer %}{% endblock %}
{% block footer %}{% endblock %}

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

@ -9,13 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='kuryr') }}
{% if install_type == 'binary' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% elif install_type == 'source' %}
ADD kuryr-base-archive /kuryr-base-source
{% set kuryr_base_pip_packages = [
@ -29,7 +22,6 @@ RUN ln -s kuryr-base-source/* kuryr-base \
&& {{ macros.install_pip(kuryr_base_pip_packages | customizable("pip_packages")) }} \
&& mkdir -p /etc/kuryr \
&& chown -R kuryr: /etc/kuryr
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start

28
docker/kuryr/kuryr-libnetwork/Dockerfile.j2
View File

@ -9,26 +9,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.enable_extra_repos(['openvswitch']) }}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% set kuryr_libnetwork_packages = [
'openvswitch'
] %}
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% elif base_package_type == 'deb' %}
{% set kuryr_libnetwork_packages = [
'openvswitch'
] %}
{% set kuryr_libnetwork_packages = [
'bridge-utils',
'openvswitch-switch'
] %}
{% elif base_package_type == 'deb' %}
{% set kuryr_libnetwork_packages = [
'bridge-utils',
'openvswitch-switch'
] %}
{% endif %}
{% endif %}
{{ macros.install_packages(kuryr_libnetwork_packages | customizable("packages")) }}
ADD kuryr-libnetwork-archive /kuryr-libnetwork-source
@ -40,7 +34,5 @@ ADD kuryr-libnetwork-archive /kuryr-libnetwork-source
RUN ln -s kuryr-libnetwork-source/* kuryr-libnetwork \
&& {{ macros.install_pip(kuryr_libnetwork_pip_packages | customizable("pip_packages")) }}
{% endif %}
{% block kuryr_libnetwork_footer %}{% endblock %}
{% block footer %}{% endblock %}

9
docker/magnum/magnum-api/Dockerfile.j2
View File

@ -7,15 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set magnum_api_packages = ['openstack-magnum-api'] %}
{% elif base_package_type == 'deb' %}
{% set magnum_api_packages = ['magnum-api'] %}
{% endif %}
{{ macros.install_packages(magnum_api_packages | customizable("packages")) }}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_magnum_extend_start
RUN chmod 755 /usr/local/bin/kolla_magnum_extend_start

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

@ -9,16 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='magnum') }}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set magnum_base_packages = ['openstack-magnum-common'] %}
{% elif base_package_type == 'deb' %}
{% set magnum_base_packages = ['magnum-common'] %}
{% endif %}
{{ macros.install_packages(magnum_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
ADD magnum-base-archive /magnum-base-source
{% set magnum_base_pip_packages = [
@ -32,8 +22,6 @@ RUN ln -s magnum-base-source/* magnum \
&& mv /etc/magnum/keystone_auth_default_policy.sample /etc/magnum/keystone_auth_default_policy.json \
&& chown -R magnum: /etc/magnum
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_magnum_extend_start \

15
docker/magnum/magnum-conductor/Dockerfile.j2
View File

@ -7,21 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set magnum_conductor_packages = [
'openstack-magnum-conductor'
] %}
{% elif base_package_type == 'deb' %}
{% set magnum_conductor_packages = [
'magnum-conductor'
] %}
{% endif %}
{{ macros.install_packages(magnum_conductor_packages | customizable("packages")) }}
{% endif %}
{% block magnum_conductor_footer %}{% endblock %}
{% block footer %}{% endblock %}

21
docker/manila/manila-api/Dockerfile.j2
View File

@ -7,30 +7,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set manila_api_packages = [
] %}
{% elif base_package_type == 'deb' %}
{% set manila_api_packages = [
'manila-api'
] %}
{% endif %}
{{ macros.install_packages(manila_api_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/manila \
&& cp -a /usr/bin/manila-wsgi /var/www/cgi-bin/manila/manila-wsgi
{% elif install_type == 'source' %}
{% set manila_api_packages = [
] %}
{% set manila_api_packages = [
] %}
{{ macros.install_packages(manila_api_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/manila \
&& cp -a /var/lib/kolla/venv/bin/manila-wsgi /var/www/cgi-bin/manila/manila-wsgi
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_manila_extend_start
RUN chmod 755 /usr/local/bin/kolla_manila_extend_start \
&& chown -R manila: /var/www/cgi-bin/manila \

32
docker/manila/manila-base/Dockerfile.j2
View File

@ -10,35 +10,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.enable_extra_repos(['openvswitch']) }}
{{ macros.configure_user(name='manila') }}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% if base_package_type == 'rpm' %}
{% set manila_base_packages = [
'openstack-manila',
'openvswitch'
] %}
{% set manila_base_packages = ['openvswitch'] %}
{% elif base_package_type == 'deb' %}
{% elif base_package_type == 'deb' %}
{% set manila_base_packages = [
'manila-common',
'openvswitch-switch'
] %}
{% set manila_base_packages = ['openvswitch-switch'] %}
{% endif %}
{{ macros.install_packages(manila_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set manila_base_packages = ['openvswitch'] %}
{% elif base_package_type == 'deb' %}
{% set manila_base_packages = ['openvswitch-switch'] %}
{% endif %}
{% endif %}
{{ macros.install_packages(manila_base_packages | customizable("packages")) }}
@ -55,8 +35,6 @@ RUN ln -s manila-base-source/* manila \
&& chown -R manila: /etc/manila /var/cache/manila \
&& sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/manila/rootwrap.conf
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
COPY manila_sudoers /etc/sudoers.d/kolla_manila_sudoers

28
docker/manila/manila-data/Dockerfile.j2
View File

@ -7,29 +7,17 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'deb' %}
{% if base_package_type == 'rpm' %}
{% set manila_data_packages = [
'manila-data'
] %}
{% set manila_data_packages = [
'nfs-utils'
] %}
{% endif %}
{% elif base_package_type == 'deb' %}
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set manila_data_packages = [
'nfs-utils'
] %}
{% elif base_package_type == 'deb' %}
{% set manila_data_packages = [
'nfs-common'
] %}
{% endif %}
{% set manila_data_packages = [
'nfs-common'
] %}
{% endif %}

12
docker/manila/manila-scheduler/Dockerfile.j2
View File

@ -7,18 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'deb' %}
{% set manila_scheduler_packages = [
'manila-scheduler'
] %}
{{ macros.install_packages(manila_scheduler_packages | customizable("packages")) }}
{% endif%}
{% endif%}
{% block manila_scheduler_footer %}{% endblock %}
{% block footer %}{% endblock %}

61
docker/manila/manila-share/Dockerfile.j2
View File

@ -9,53 +9,26 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.enable_extra_repos(['ceph']) }}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set manila_share_packages = [
'openstack-manila-share',
'ceph-common',
'glusterfs-fuse',
'sqlite',
] %}
{% elif base_package_type == 'deb' %}
{% set manila_share_packages = [
'manila-share',
'ceph-common',
'glusterfs-client',
'python3-cephfs',
'python3-rados',
'python3-rbd',
'sqlite3'
] %}
{% endif %}
{{ macros.install_packages(manila_share_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set manila_share_packages = [
'ceph-common',
'glusterfs-fuse',
'sqlite',
] %}
{% elif base_package_type == 'deb' %}
{% set manila_share_packages = [
'ceph-common',
'glusterfs-client',
'python3-cephfs',
'python3-rados',
'python3-rbd',
'sqlite3'
] %}
{% endif %}
{{ macros.install_packages(manila_share_packages | customizable("packages")) }}
{% if base_package_type == 'rpm' %}
{% set manila_share_packages = [
'ceph-common',
'glusterfs-fuse',
'sqlite',
] %}
{% elif base_package_type == 'deb' %}
{% set manila_share_packages = [
'ceph-common',
'glusterfs-client',
'python3-cephfs',
'python3-rados',
'python3-rbd',
'sqlite3'
] %}
{% endif %}
{{ macros.install_packages(manila_share_packages | customizable("packages")) }}
{% block manila_share_footer %}{% endblock %}
{% block footer %}{% endblock %}

24
docker/masakari/masakari-api/Dockerfile.j2
View File

@ -7,30 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{# not available #}
{% set masakari_base_packages = [
] %}
{% elif base_package_type == 'deb' %}
{% set masakari_base_packages = [
'masakari-api',
] %}
{% endif %}
{{ macros.install_packages(masakari_base_packages | customizable("packages")) }}
{% if base_package_type == 'deb' %}
RUN rm -f /etc/apache2/sites-enabled/masakari-api.conf
{% endif %}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_masakari_extend_start
RUN chmod 755 /usr/local/bin/kolla_masakari_extend_start

36
docker/masakari/masakari-base/Dockerfile.j2
View File

@ -9,37 +9,17 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='masakari') }}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% if base_package_type == 'rpm' %}
{% set masakari_base_packages = [
] %}
{# not available #}
{% set masakari_base_packages = [
] %}
{% elif base_package_type == 'deb' %}
{% elif base_package_type == 'deb' %}
{% set masakari_base_packages = [
] %}
{% set masakari_base_packages = [
'python3-masakari',
] %}
{% endif %}
{{ macros.install_packages(masakari_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set masakari_base_packages = [
] %}
{% elif base_package_type == 'deb' %}
{% set masakari_base_packages = [
] %}
{% endif %}
{% endif %}
{{ macros.install_packages(masakari_base_packages | customizable("packages")) }}
@ -58,8 +38,6 @@ RUN ln -s masakari-base-source/* masakari \
&& chown -R masakari: /etc/masakari /var/www/cgi-bin/masakari \
&& chmod 755 /var/www/cgi-bin/masakari
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_masakari_extend_start \

20
docker/masakari/masakari-engine/Dockerfile.j2
View File

@ -7,26 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{# not available #}
{% set masakari_base_packages = [
] %}
{% elif base_package_type == 'deb' %}
{% set masakari_base_packages = [
'masakari-engine',
] %}
{% endif %}
{{ macros.install_packages(masakari_base_packages | customizable("packages")) }}
{% endif %}
{% block masakari_engine_footer %}{% endblock %}
{% block footer %}{% endblock %}

61
docker/masakari/masakari-monitors/Dockerfile.j2
View File

@ -9,52 +9,27 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.enable_extra_repos(['hacluster', 'libvirt']) }}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% if base_package_type == 'rpm' %}
{% set masakari_monitors_packages = [
'cyrus-sasl-md5',
'cyrus-sasl-scram',
'python3-libvirt',
'pacemaker-cli',
'tcpdump',
] %}
{# not available #}
{% set masakari_base_packages = [
] %}
{% elif base_package_type == 'deb' %}
{% elif base_package_type == 'deb' %}
{% set masakari_monitors_packages = [
'libsasl2-modules-gssapi-mit',
'python3-libvirt',
'pacemaker-cli-utils',
'sasl2-bin',
'tcpdump',
] %}
{% set masakari_base_packages = [
'libsasl2-modules-gssapi-mit',
'masakari-host-monitor',
'masakari-instance-monitor',
'masakari-introspective-instance-monitor',
'masakari-process-monitor',
'sasl2-bin',
] %}
{% endif %}
{{ macros.install_packages(masakari_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set masakari_monitors_packages = [
'cyrus-sasl-md5',
'cyrus-sasl-scram',
'python3-libvirt',
'pacemaker-cli',
'tcpdump',
] %}
{% elif base_package_type == 'deb' %}
{% set masakari_monitors_packages = [
'libsasl2-modules-gssapi-mit',
'python3-libvirt',
'pacemaker-cli-utils',
'sasl2-bin',
'tcpdump',
] %}
{% endif %}
{% endif %}
{{ macros.install_packages(masakari_monitors_packages | customizable("packages")) }}
@ -74,8 +49,6 @@ COPY masakari_monitors_sudoers /etc/sudoers.d/kolla_masakari_monitors_sudoers
RUN chmod 750 /etc/sudoers.d \
&& chmod 640 /etc/sudoers.d/kolla_masakari_monitors_sudoers
{% endif %}
{% block masakari_monitors_footer %}{% endblock %}
{% block footer %}{% endblock %}

21
docker/mistral/mistral-api/Dockerfile.j2
View File

@ -7,27 +7,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set mistral_api_packages = [
'openstack-mistral-api'
] %}
{% set mistral_api_packages = [
] %}
{{ macros.install_packages(mistral_api_packages | customizable("packages")) }}
{% elif base_package_type == 'deb' %}
{% set mistral_api_packages = [
'mistral-api'
] %}
{{ macros.install_packages(mistral_api_packages | customizable("packages")) }}
{% endif %}
{% elif install_type == 'source' %}
{% set mistral_api_packages = [
] %}
{{ macros.install_packages(mistral_api_packages | customizable("packages")) }}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_mistral_extend_start
RUN chmod 755 /usr/local/bin/kolla_mistral_extend_start

20
docker/mistral/mistral-base/Dockerfile.j2
View File

@ -9,25 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='mistral') }}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set mistral_base_packages = [
'openstack-mistral-common',
'openstack-tacker',
'redis',
] %}
# Note(egonzalez): Ubuntu does not have tacker packages yet.
{% elif base_package_type == 'deb' %}
{% set mistral_base_packages = [
'mistral-common',
'redis-server'
] %}
{% endif %}
{{ macros.install_packages(mistral_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
ADD mistral-base-archive /mistral-base-source
ADD plugins-archive /
@ -48,7 +29,6 @@ RUN ln -s mistral-base-source/* mistral \
&& if [ "$(ls /plugins)" ]; then \
{{ macros.install_pip(mistral_base_plugins_pip_packages) }}; \
fi
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start

9
docker/mistral/mistral-engine/Dockerfile.j2
View File

@ -7,15 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set mistral_engine_packages = ['openstack-mistral-engine'] %}
{% elif base_package_type == 'deb' %}
{% set mistral_engine_packages = ['mistral-engine'] %}
{% endif %}
{{ macros.install_packages(mistral_engine_packages | customizable("packages")) }}
{% endif %}
{% block mistral_engine_footer %}{% endblock %}
{% block footer %}{% endblock %}

10
docker/mistral/mistral-event-engine/Dockerfile.j2
View File

@ -7,16 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set mistral_event_engine_packages = ['openstack-mistral-event-engine'] %}
{% elif base_package_type == 'deb' %}
{% set mistral_event_engine_packages = ['mistral-event-engine'] %}
{% endif %}
{{ macros.install_packages(mistral_event_engine_packages | customizable("packages")) }}
{% endif %}
{% block mistral_event_engine_footer %}{% endblock %}
{% block footer %}{% endblock %}

9
docker/mistral/mistral-executor/Dockerfile.j2
View File

@ -7,15 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set mistral_executor_packages = ['openstack-mistral-executor'] %}
{% elif base_package_type == 'deb' %}
{% set mistral_executor_packages = ['mistral-executor'] %}
{% endif %}
{{ macros.install_packages(mistral_executor_packages | customizable("packages")) }}
{% endif %}
{% block mistral_executor_footer %}{% endblock %}
{% block footer %}{% endblock %}

10
docker/monasca/monasca-agent/Dockerfile.j2
View File

@ -7,13 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% elif install_type == 'source' %}
ADD monasca-agent-archive /monasca-agent-source
{% set monasca_agent_pip_packages = [
@ -24,11 +17,8 @@ ADD monasca-agent-archive /monasca-agent-source
RUN ln -s monasca-agent-source/* monasca-agent \
&& {{ macros.install_pip(monasca_agent_pip_packages | customizable("pip_packages")) }}
{% endif %}
{% block monasca_agent_footer %}{% endblock %}
{% block footer %}{% endblock %}
USER monasca

23
docker/monasca/monasca-api/Dockerfile.j2
View File

@ -7,20 +7,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set monasca_api_packages = [
] %}
{% elif base_package_type == 'deb' %}
{% set monasca_api_packages = [
] %}
{% endif %}
{% if base_package_type == 'rpm' %}
{% set monasca_api_packages = [
] %}
{% elif base_package_type == 'deb' %}
{% set monasca_api_packages = [
] %}
{% endif %}
{{ macros.install_packages(monasca_api_packages | customizable("packages")) }}
ADD monasca-api-archive /monasca-api-source
@ -33,8 +26,6 @@ ADD monasca-api-archive /monasca-api-source
RUN ln -s monasca-api-source/* monasca-api \
&& {{ macros.install_pip(monasca_api_pip_packages | customizable("pip_packages")) }}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_monasca_extend_start
RUN chmod 755 /usr/local/bin/kolla_monasca_extend_start

24
docker/monasca/monasca-base/Dockerfile.j2
View File

@ -9,20 +9,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='monasca') }}
{% if install_type == 'binary' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set monasca_base_packages = [
] %}
{% elif base_package_type == 'deb' %}
{% set monasca_base_packages = [
'librdkafka-dev'
] %}
{% endif %}
{% if base_package_type == 'rpm' %}
{% set monasca_base_packages = [
] %}
{% elif base_package_type == 'deb' %}
{% set monasca_base_packages = [
'librdkafka-dev'
] %}
{% endif %}
{{ macros.install_packages(monasca_base_packages | customizable("packages")) }}
@ -37,8 +31,6 @@ RUN {{ macros.install_pip(monasca_base_pip_packages | customizable("pip_packages
&& chown -R monasca: /etc/monasca
{% endblock %}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_monasca_extend_start \

10
docker/monasca/monasca-notification/Dockerfile.j2
View File

@ -7,13 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% elif install_type == 'source' %}
ADD monasca-notification-archive /monasca-notification-source
{% set monasca_notification_pip_packages = [
@ -23,11 +16,8 @@ ADD monasca-notification-archive /monasca-notification-source
RUN ln -s monasca-notification-source/* monasca-notification \
&& {{ macros.install_pip(monasca_notification_pip_packages | customizable("pip_packages")) }}
{% endif %}
{% block monasca_notification_footer %}{% endblock %}
{% block footer %}{% endblock %}
USER monasca

10
docker/monasca/monasca-persister/Dockerfile.j2
View File

@ -7,13 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% elif install_type == 'source' %}
ADD monasca-persister-archive /monasca-persister-source
{% set monasca_persister_pip_packages = [
@ -26,11 +19,8 @@ ADD monasca-persister-archive /monasca-persister-source
RUN ln -s monasca-persister-source/* monasca-persister \
&& {{ macros.install_pip(monasca_persister_pip_packages | customizable("pip_packages")) }}
{% endif %}
{% block monasca_persister_footer %}{% endblock %}
{% block footer %}{% endblock %}
USER monasca

9
docker/monasca/monasca-thresh/Dockerfile.j2
View File

@ -10,13 +10,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.add_binary_source_envs() }}
{{ macros.configure_user(name='monasca') }}
{% if install_type == 'binary' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set monasca_thresh_packages = [
'maven',
@ -62,8 +55,6 @@ RUN cd /monasca-common-source/java \
&& mvn clean package {{ build_opts|join(' ') }}
{% endblock %}
{% endif %}
# Overwrite the script inherited from Storm
COPY extend_start.sh /usr/local/bin/kolla_extend_start

15
docker/murano/murano-api/Dockerfile.j2
View File

@ -7,21 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
RUN ln -s /var/cache/murano/meta/io.murano.zip /io.murano.zip \
&& ln -s /var/cache/murano/meta/io.murano.applications.zip /io.murano.applications.zip
{% set murano_api_packages = ['openstack-murano-api'] %}
{% elif base_package_type == 'deb' %}
RUN ln -s /usr/share/murano-common/io.murano.zip /io.murano.zip \
&& ln -s /var/cache/murano/meta/io.murano.applications.zip /io.murano.applications.zip
{% set murano_api_packages = ['murano-api'] %}
{% endif %}
{{ macros.install_packages(murano_api_packages | customizable("packages")) }}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_murano_extend_start
RUN chmod 755 /usr/local/bin/kolla_murano_extend_start

14
docker/murano/murano-base/Dockerfile.j2
View File

@ -9,18 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='murano') }}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set murano_base_packages = ['openstack-murano-common'] %}
{% elif base_package_type == 'deb' %}
{% set murano_base_packages = ['murano-common'] %}
{% endif %}
{{ macros.install_packages(murano_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
ADD murano-base-archive /murano-base-source
{% set murano_base_pip_packages = [
@ -37,8 +25,6 @@ RUN ln -s murano-base-source/* murano \
&& cd /murano/meta/io.murano.applications \
&& zip -r /io.murano.applications.zip *
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_murano_extend_start \

11
docker/murano/murano-engine/Dockerfile.j2
View File

@ -7,17 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set murano_engine_packages = ['openstack-murano-engine'] %}
{% elif base_package_type == 'deb' %}
{% set murano_engine_packages = ['murano-engine'] %}
{% endif %}
{{ macros.install_packages(murano_engine_packages | customizable("packages")) }}
{% endif %}
{% block murano_engine_footer %}{% endblock %}
{% block footer %}{% endblock %}

22
docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2
View File

@ -7,28 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set ironic_neutron_agent_packages = [
'python3-ironic-neutron-agent',
'python3-networking-baremetal'
] %}
{% elif base_package_type == 'deb' %}
{% set ironic_neutron_agent_packages = [
'ironic-neutron-agent',
] %}
{% endif %}
{{ macros.install_packages(ironic_neutron_agent_packages | customizable("packages")) }}
{% endif %}
{% block ironic_neutron_agent_footer %}{% endblock %}
{% block footer %}{% endblock %}

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

@ -10,82 +10,45 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.enable_extra_repos(['openvswitch']) }}
{{ macros.configure_user(name='neutron') }}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% if base_package_type == 'rpm' %}
{% set neutron_base_packages = [
'iputils',
'keepalived',
'net-tools',
'radvd',
'openstack-neutron',
'openstack-neutron-ml2',
'openvswitch',
'python3-networking-baremetal',
'python3-networking-sfc',
'python3-openvswitch',
'python3-oslo-vmware'
] %}
{% set neutron_base_packages = [
'conntrack-tools',
'dnsmasq',
'dnsmasq-utils',
'haproxy',
'ipset',
'iptables',
'iputils',
'keepalived',
'net-tools',
'openvswitch',
'python3-openvswitch',
'radvd',
'uuid'
] %}
{% elif base_package_type == 'deb' %}
{% elif base_package_type == 'deb' %}
{% set neutron_base_packages = [
'iproute2',
'iputils-ping',
'keepalived',
'net-tools',
'radvd',
'neutron-plugin-ml2',
'neutron-server',
'openvswitch-switch',
'python3-networking-sfc',
'python3-openvswitch',
'python3-oslo.vmware'
] %}
{% endif %}
{% set neutron_base_packages = [
'conntrack',
'dnsmasq',
'dnsmasq-utils',
'haproxy',
'iproute2',
'ipset',
'iptables',
'iputils-arping',
'iputils-ping',
'keepalived',
'net-tools',
'openvswitch-switch',
'python3-openvswitch',
'radvd',
'uuid-runtime'
] %}
{{ macros.install_packages(neutron_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set neutron_base_packages = [
'conntrack-tools',
'dnsmasq',
'dnsmasq-utils',
'haproxy',
'ipset',
'iptables',
'iputils',
'keepalived',
'net-tools',
'openvswitch',
'python3-openvswitch',
'radvd',
'uuid'
] %}
{% elif base_package_type == 'deb' %}
{% set neutron_base_packages = [
'conntrack',
'dnsmasq',
'dnsmasq-utils',
'haproxy',
'iproute2',
'ipset',
'iptables',
'iputils-arping',
'iputils-ping',
'keepalived',
'net-tools',
'openvswitch-switch',
'python3-openvswitch',
'radvd',
'uuid-runtime'
] %}
{% endif %}
{% endif %}
{{ macros.install_packages(neutron_base_packages | customizable("packages")) }}
@ -118,8 +81,6 @@ RUN ln -s neutron-base-source/* neutron \
done; \
fi
{% endif %}
COPY neutron_sudoers /etc/sudoers.d/kolla_neutron_sudoers
COPY extend_start.sh /usr/local/bin/kolla_extend_start

18
docker/neutron/neutron-bgp-dragent/Dockerfile.j2
View File

@ -7,22 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set neutron_bgp_dragent_packages = [
'openstack-neutron-bgp-dragent'
] %}
{% elif base_package_type == 'deb' %}
{% set neutron_bgp_dragent_packages = [
'neutron-bgp-dragent'
] %}
{% endif %}
{{ macros.install_packages(neutron_bgp_dragent_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
ADD neutron-bgp-dragent-archive /neutron-bgp-dragent-source
{% set neutron_bgp_dragent_pip_packages = [
@ -32,8 +16,6 @@ ADD neutron-bgp-dragent-archive /neutron-bgp-dragent-source
RUN ln -s neutron-bgp-dragent-source/* neutron_dynamic_routing \
&& {{ macros.install_pip(neutron_bgp_dragent_pip_packages | customizable("pip_packages")) }}
{% endif %}
{% block neutron_bgp_dragent_footer %}{% endblock %}
{% block footer %}{% endblock %}

9
docker/neutron/neutron-dhcp-agent/Dockerfile.j2
View File

@ -7,13 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if base_package_type == 'deb' %}
{% if install_type == 'binary' %}
{% set neutron_dhcp_agent_packages = [
'neutron-dhcp-agent'
] %}
{% endif %}
{% endif %}
{% set neutron_dhcp_agent_packages = [
] %}
{{ macros.install_packages(neutron_dhcp_agent_packages | customizable("packages")) }}

50
docker/neutron/neutron-l3-agent/Dockerfile.j2
View File

@ -7,44 +7,22 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set neutron_l3_agent_packages = [
'openstack-neutron-vpn-agent',
'libreswan'
] %}
# TODO(chenxing) Currently, there is no Ubuntu vpnaas package for Queens release.
{% elif base_package_type == 'deb' %}
{% set neutron_l3_agent_packages = [
'neutron-l3-agent',
'strongswan'
] %}
{% endif %}
{{ macros.install_packages(neutron_l3_agent_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set neutron_l3_agent_packages = [
'libreswan',
'radvd',
'dibbler-client'
] %}
{% elif base_package_type == 'deb' %}
{% set neutron_l3_agent_packages = [
'strongswan',
'radvd',
'dibbler-client'
] %}
{% endif %}
{{ macros.install_packages(neutron_l3_agent_packages | customizable("packages")) }}
{% if base_package_type == 'rpm' %}
{% set neutron_l3_agent_packages = [
'libreswan',
'radvd',
'dibbler-client'
] %}
{% elif base_package_type == 'deb' %}
{% set neutron_l3_agent_packages = [
'strongswan',
'radvd',
'dibbler-client'
] %}
{% endif %}
{{ macros.install_packages(neutron_l3_agent_packages | customizable("packages")) }}
{% block neutron_l3_agent_footer %}{% endblock %}
{% block footer %}{% endblock %}

27
docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
View File

@ -7,30 +7,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set neutron_linuxbridge_agent_packages = [
'ebtables',
'openstack-neutron-linuxbridge'
] %}
{% elif base_package_type == 'deb' %}
{% set neutron_linuxbridge_agent_packages = [
'ebtables',
'neutron-linuxbridge-agent'
] %}
{% endif %}
{% elif install_type == 'source' %}
{% set neutron_linuxbridge_agent_packages = [
'ebtables'
] %}
{% endif %}
{% set neutron_linuxbridge_agent_packages = [
'ebtables'
] %}
{{ macros.install_packages(neutron_linuxbridge_agent_packages | customizable("packages")) }}

11
docker/neutron/neutron-metadata-agent/Dockerfile.j2
View File

@ -7,15 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if base_package_type == 'deb' %}
{% if install_type == 'binary' %}
{% set neutron_metadata_agent_packages = [
'neutron-metadata-agent'
] %}
{% endif %}
{% endif %}
{% set neutron_metadata_agent_packages = [
] %}
{{ macros.install_packages(neutron_metadata_agent_packages | customizable("packages")) }}

13
docker/neutron/neutron-metering-agent/Dockerfile.j2
View File

@ -7,19 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set neutron_metering_agent_packages = ['openstack-neutron-metering-agent'] %}
{% elif base_package_type == 'deb' %}
{% set neutron_metering_agent_packages = ['neutron-metering-agent'] %}
{% endif %}
{{ macros.install_packages(neutron_metering_agent_packages | customizable("packages")) }}
{% endif %}
{% block neutron_metering_agent_footer %}{% endblock %}
{% block footer %}{% endblock %}

18
docker/neutron/neutron-mlnx-agent/Dockerfile.j2
View File

@ -14,26 +14,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python3-ethtool',
] %}
{% if install_type == 'binary' %}
{% set neutron_mlnx_agent_packages = neutron_mlnx_agent_packages + [
'python3-networking-mlnx'
] %}
{% endif %}
{{ macros.install_packages(neutron_mlnx_agent_packages | customizable("packages")) }}
{% if install_type == 'source' %}
{% set neutron_mlnx_agent_pip_packages = [
'networking-mlnx'
] %}
{% set neutron_mlnx_agent_pip_packages = [
'networking-mlnx'
] %}
RUN {{ macros.install_pip(neutron_mlnx_agent_pip_packages | customizable("pip_packages")) }}
{% endif %}
{% block neutron_mlnx_agent_footer %}{% endblock %}
{% block footer %}{% endblock %}

17
docker/neutron/neutron-openvswitch-agent/Dockerfile.j2
View File

@ -7,23 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set neutron_openvswitch_agent_packages = [
'libibverbs',
'openstack-neutron-openvswitch'
] %}
{% elif base_package_type == 'deb' %}
{% set neutron_openvswitch_agent_packages = [
'neutron-openvswitch-agent'
] %}
{% endif %}
{% endif %}
{{ macros.install_packages(neutron_openvswitch_agent_packages | customizable("packages")) }}
{% block neutron_openvswitch_agent_footer %}{% endblock %}

35
docker/neutron/neutron-server/Dockerfile.j2
View File

@ -7,34 +7,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set neutron_server_packages = [
'openstack-neutron-vpnaas',
'python3-networking-generic-switch'
] %}
{% set neutron_server_pip_packages = [
'networking-hyperv'
] %}
{% elif base_package_type == 'deb' %}
{% set neutron_server_packages = [
'python3-ironic-neutron-agent',
'python3-neutron-dynamic-routing',
'python3-neutron-vpnaas'
] %}
{% endif %}
{{ macros.install_packages(neutron_server_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% set neutron_server_pip_packages = [
'networking-hyperv'
] %}
{% set neutron_server_plugins_pip_packages = [
'/plugins/*'
] %}
{% set neutron_server_plugins_pip_packages = [
'/plugins/*'
] %}
ADD plugins-archive /
RUN {{ macros.install_pip(neutron_server_pip_packages | customizable("pip_packages")) }} \
@ -42,8 +21,6 @@ RUN {{ macros.install_pip(neutron_server_pip_packages | customizable("pip_packag
{{ macros.install_pip(neutron_server_plugins_pip_packages) }}; \
fi
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_neutron_extend_start
RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start

16
docker/neutron/neutron-sriov-agent/Dockerfile.j2
View File

@ -7,22 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set neutron_sriov_agent_packages = [
'openstack-neutron-sriov-nic-agent'
] %}
{% elif base_package_type == 'deb' %}
{% set neutron_sriov_agent_packages = [
'neutron-sriov-agent'
] %}
{% endif %}
{% endif %}
{{ macros.install_packages(neutron_sriov_agent_packages | customizable("packages")) }}
{% block neutron_sriov_agent_footer %}{% endblock %}

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

@ -7,31 +7,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set nova_api_packages = [
'openstack-nova-api'
] %}
{% set nova_api_packages = [
] %}
{{ macros.install_packages(nova_api_packages | customizable("packages")) }}
{% elif base_package_type == 'deb' %}
{% set nova_api_packages = [
'nova-api',
'python3-memcache'
] %}
{{ macros.install_packages(nova_api_packages | customizable("packages")) }}
{% endif %}
{% elif install_type == 'source' %}
{% set nova_api_packages = [
] %}
{{ macros.install_packages(nova_api_packages | customizable("packages")) }}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_nova_extend_start
RUN chmod 755 /usr/local/bin/kolla_nova_extend_start

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

@ -10,86 +10,46 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.enable_extra_repos(['libvirt', 'openvswitch']) }}
{{ macros.configure_user(name='nova', groups='qemu') }}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% if base_package_type == 'rpm' %}
{% set nova_base_packages = [
'openstack-nova-common',
'openvswitch'
] %}
{% if base_arch == 'x86_64' %}
{% set nova_base_packages = nova_base_packages + [
'edk2-ovmf'
] %}
{% elif base_arch == 'aarch64' %}
{% set nova_base_packages = nova_base_packages + [
'edk2-aarch64'
] %}
{% endif %}
{% elif base_package_type == 'deb' %}
{% set nova_base_packages = [
'nova-common',
'openvswitch-switch',
'python3-nova'
] %}
{% if base_arch == 'x86_64' %}
{% set nova_base_packages = nova_base_packages + [
'ovmf'
] %}
{% elif base_arch == 'aarch64' %}
{% set nova_base_packages = nova_base_packages + [
'qemu-efi',
] %}
{% endif %}
{% endif %}
{{ macros.install_packages(nova_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set nova_base_packages = [
'openvswitch',
'python3-openvswitch'
] %}
{% if base_arch == 'x86_64' %}
{% set nova_base_packages = nova_base_packages + [
'edk2-ovmf'
] %}
{% elif base_arch == 'aarch64' %}
{% set nova_base_packages = nova_base_packages + [
'edk2-aarch64'
] %}
{% endif %}
{% elif base_package_type == 'deb' %}
{% set nova_base_packages = [
'dnsmasq',
'ebtables',
'iproute2',
'iptables',
'openssh-client',
'openvswitch-switch',
'python3-libvirt',
{% set nova_base_packages = [
'openvswitch',
'python3-openvswitch'
] %}
{% if base_arch == 'x86_64' %}
{% set nova_base_packages = nova_base_packages + [
'edk2-ovmf'
] %}
{% elif base_arch == 'aarch64' %}
{% set nova_base_packages = nova_base_packages + [
'edk2-aarch64'
] %}
{% if base_arch == 'x86_64' %}
{% set nova_base_packages = nova_base_packages + [
'ovmf'
] %}
{% elif base_arch == 'aarch64' %}
{% set nova_base_packages = nova_base_packages + [
'qemu-efi',
] %}
{% endif %}
{% endif %}
{% elif base_package_type == 'deb' %}
{% set nova_base_packages = [
'dnsmasq',
'ebtables',
'iproute2',
'iptables',
'openssh-client',
'openvswitch-switch',
'python3-libvirt',
'python3-openvswitch'
] %}
{% if base_arch == 'x86_64' %}
{% set nova_base_packages = nova_base_packages + [
'ovmf'
] %}
{% elif base_arch == 'aarch64' %}
{% set nova_base_packages = nova_base_packages + [
'qemu-efi',
] %}
{% endif %}
{% endif %}
{{ macros.install_packages(nova_base_packages | customizable("packages")) }}
ADD nova-base-archive /nova-base-source
@ -117,9 +77,6 @@ COPY nova_sudoers /etc/sudoers.d/kolla_nova_sudoers
RUN chmod 750 /etc/sudoers.d \
&& chmod 440 /etc/sudoers.d/kolla_nova_sudoers
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_nova_extend_start \

23
docker/nova/nova-compute-ironic/Dockerfile.j2
View File

@ -9,31 +9,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set nova_compute_ironic_packages = ['genisoimage', 'nvme-cli'] %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set nova_compute_ironic_packages = nova_compute_ironic_packages + [
'openstack-nova-compute'
] %}
{{ macros.install_packages(nova_compute_ironic_packages | customizable("packages")) }}
{% elif base_package_type == 'deb' %}
{% set nova_compute_ironic_packages = nova_compute_ironic_packages + [
'nova-compute'
] %}
{{ macros.install_packages(nova_compute_ironic_packages | customizable("packages")) }}
RUN rm /etc/nova/nova-compute.conf
{% endif %}
{% elif install_type == 'source' %}
{{ macros.install_packages(nova_compute_ironic_packages | customizable("packages")) }}
{% endif %}
{% block nova_compute_ironic_footer %}{% endblock %}
{% block footer %}{% endblock %}

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

@ -9,162 +9,82 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.enable_extra_repos(['ceph', 'libvirt']) }}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% if base_package_type == 'rpm' %}
{% set nova_compute_packages = [
'ceph-common',
'cyrus-sasl-md5',
'cyrus-sasl-scram',
'device-mapper-multipath',
'e2fsprogs',
'genisoimage',
'iscsi-initiator-utils',
'ndctl',
'nfs-utils',
'openstack-nova-compute',
'openvswitch',
'parted',
'python3-libguestfs',
'python3-oslo-vmware',
'python3-rtslib',
'sysfsutils',
'targetcli',
'xfsprogs'
{% set nova_compute_packages = [
'ceph-common',
'cyrus-sasl-md5',
'cyrus-sasl-scram',
'device-mapper-multipath',
'dosfstools',
'e2fsprogs',
'genisoimage',
'iscsi-initiator-utils',
'libosinfo',
'ndctl',
'nfs-utils',
'nvme-cli',
'openvswitch',
'parted',
'python3-libguestfs',
'python3-libvirt',
'python3-rtslib',
'qemu-img',
'sysfsutils',
'targetcli',
'xfsprogs'
] %}
# NOTE(hrw): daxio is part of pmdk which is x86-64 only in CentOS 8
{% if base_arch == 'x86_64' %}
{% set nova_compute_packages = nova_compute_packages + [
'daxio'
] %}
# NOTE(hrw): daxio is part of pmdk which is x86-64 only in CentOS 8
{% if base_arch == 'x86_64' %}
{% set nova_compute_packages = nova_compute_packages + [
'daxio'
] %}
{% endif %}
{{ macros.install_packages(nova_compute_packages | customizable("packages")) }} \
&& dnf remove -y linux-firmware \
&& dnf clean all
{% elif base_package_type == 'deb' %}
# ironic as workaround https://bugs.launchpad.net/packstack/+bug/1430388
{% set nova_compute_packages = [
'ceph-common',
'e2fsprogs',
'genisoimage',
'ironic-common',
'libsasl2-modules-gssapi-mit',
'multipath-tools',
'nfs-common',
'nova-compute',
'nvme-cli',
'open-iscsi',
'openvswitch-switch',
'parted',
'pmdk-tools',
'python3-cephfs',
'python3-guestfs',
'python3-ironicclient',
'python3-oslo.vmware',
'python3-rados',
'python3-rbd',
'python3-rtslib-fb',
'sasl2-bin',
'sysfsutils',
'targetcli-fb',
'xfsprogs'
] %}
# FIXME(pkopec): since Ubuntu 19.04 'ndctl' package is available
# for other archs than 'x86_64
{% if base_distro == 'debian' or
(base_distro == 'ubuntu' and base_arch == 'x86_64') %}
{% set nova_compute_packages = nova_compute_packages + [
'ndctl',
] %}
{% endif %}
{{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
RUN rm -f /etc/nova/nova-compute.conf
{% endif %}
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set nova_compute_packages = [
'ceph-common',
'cyrus-sasl-md5',
'cyrus-sasl-scram',
'device-mapper-multipath',
'dosfstools',
'e2fsprogs',
'genisoimage',
'iscsi-initiator-utils',
'libosinfo',
'ndctl',
'nfs-utils',
'nvme-cli',
'openvswitch',
'parted',
'python3-libguestfs',
'python3-libvirt',
'python3-rtslib',
'qemu-img',
'sysfsutils',
'targetcli',
'xfsprogs'
] %}
# NOTE(hrw): daxio is part of pmdk which is x86-64 only in CentOS 8
{% if base_arch == 'x86_64' %}
{% set nova_compute_packages = nova_compute_packages + [
'daxio'
] %}
{% endif %}
{{ macros.install_packages(nova_compute_packages | customizable("packages")) }} \
&& dnf remove -y linux-firmware \
&& dnf clean all
{% elif base_package_type == 'deb' %}
{% elif base_package_type == 'deb' %}
{% set nova_compute_packages = [
'ceph-common',
'dosfstools',
'e2fsprogs',
'genisoimage',
'libosinfo-bin',
'libsasl2-modules-gssapi-mit',
'multipath-tools',
'ndctl',
'nfs-common',
'nvme-cli',
'open-iscsi',
'parted',
'pmdk-tools',
'python3-cephfs',
'python3-guestfs',
'python3-libvirt',
'python3-rados',
'python3-rbd',
'python3-rtslib-fb',
'qemu-utils',
'sasl2-bin',
'sysfsutils',
'targetcli-fb',
'xfsprogs'
{% set nova_compute_packages = [
'ceph-common',
'dosfstools',
'e2fsprogs',
'genisoimage',
'libosinfo-bin',
'libsasl2-modules-gssapi-mit',
'multipath-tools',
'ndctl',
'nfs-common',
'nvme-cli',
'open-iscsi',
'parted',
'pmdk-tools',
'python3-cephfs',
'python3-guestfs',
'python3-libvirt',
'python3-rados',
'python3-rbd',
'python3-rtslib-fb',
'qemu-utils',
'sasl2-bin',
'sysfsutils',
'targetcli-fb',
'xfsprogs'
] %}
{% if base_arch == "aarch64" %}
{% set nova_compute_packages = nova_compute_packages + [
'qemu-efi'
] %}
{% if base_arch == "aarch64" %}
{% set nova_compute_packages = nova_compute_packages + [
'qemu-efi'
] %}
{% endif %}
{% endif %}
RUN mkdir -p /etc/ceph \
&& {{ macros.install_packages(nova_compute_packages | customizable("packages"), chain=True) }}
{% endif %}
{% endif %}
{% set nova_compute_pip_packages = [
'oslo-vmware'
@ -181,8 +101,6 @@ RUN {{ macros.install_pip(nova_compute_pip_packages | customizable("pip_packages
{{ macros.install_pip(nova_compute_plugins_pip_packages) }}; \
fi
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_nova_extend_start
RUN chmod 755 /usr/local/bin/kolla_nova_extend_start \
&& rm -f /etc/machine-id

19
docker/nova/nova-conductor/Dockerfile.j2
View File

@ -7,25 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set nova_conductor_packages = [
'openstack-nova-conductor'
] %}
{% elif base_package_type == 'deb' %}
{% set nova_conductor_packages = [
'nova-conductor'
] %}
{% endif %}
{{ macros.install_packages(nova_conductor_packages | customizable("packages")) }}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_nova_extend_start
RUN chmod 755 /usr/local/bin/kolla_nova_extend_start

Some files were not shown because too many files have changed in this diff Show More