diff options
151 files changed, 555 insertions, 3163 deletions
diff --git a/docker/aodh/aodh-api/Dockerfile.j2 b/docker/aodh/aodh-api/Dockerfile.j2 index 13f08f53a..3bf4626a6 100644 --- a/docker/aodh/aodh-api/Dockerfile.j2 +++ b/docker/aodh/aodh-api/Dockerfile.j2 @@ -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 diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/docker/aodh/aodh-base/Dockerfile.j2 index ce4b88675..cd61ca21a 100644 --- a/docker/aodh/aodh-base/Dockerfile.j2 +++ b/docker/aodh/aodh-base/Dockerfile.j2 @@ -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 diff --git a/docker/aodh/aodh-evaluator/Dockerfile.j2 b/docker/aodh/aodh-evaluator/Dockerfile.j2 index 7420c96ab..dc8fa55a9 100644 --- a/docker/aodh/aodh-evaluator/Dockerfile.j2 +++ b/docker/aodh/aodh-evaluator/Dockerfile.j2 @@ -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 %} diff --git a/docker/aodh/aodh-expirer/Dockerfile.j2 b/docker/aodh/aodh-expirer/Dockerfile.j2 index 278f3ab0e..7de6cc3f6 100644 --- a/docker/aodh/aodh-expirer/Dockerfile.j2 +++ b/docker/aodh/aodh-expirer/Dockerfile.j2 @@ -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 %} diff --git a/docker/aodh/aodh-listener/Dockerfile.j2 b/docker/aodh/aodh-listener/Dockerfile.j2 index 2cc890b68..c6890177d 100644 --- a/docker/aodh/aodh-listener/Dockerfile.j2 +++ b/docker/aodh/aodh-listener/Dockerfile.j2 @@ -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 %} diff --git a/docker/aodh/aodh-notifier/Dockerfile.j2 b/docker/aodh/aodh-notifier/Dockerfile.j2 index 14cd1550c..a7777aaaa 100644 --- a/docker/aodh/aodh-notifier/Dockerfile.j2 +++ b/docker/aodh/aodh-notifier/Dockerfile.j2 @@ -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 %} diff --git a/docker/barbican/barbican-api/Dockerfile.j2 b/docker/barbican/barbican-api/Dockerfile.j2 index 8aa2c14e7..0a193c060 100644 --- a/docker/barbican/barbican-api/Dockerfile.j2 +++ b/docker/barbican/barbican-api/Dockerfile.j2 @@ -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 diff --git a/docker/barbican/barbican-base/Dockerfile.j2 b/docker/barbican/barbican-base/Dockerfile.j2 index 9b28727e5..3f749a5f3 100644 --- a/docker/barbican/barbican-base/Dockerfile.j2 +++ b/docker/barbican/barbican-base/Dockerfile.j2 @@ -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 diff --git a/docker/barbican/barbican-keystone-listener/Dockerfile.j2 b/docker/barbican/barbican-keystone-listener/Dockerfile.j2 index 632fe00c4..e3cfd2e57 100644 --- a/docker/barbican/barbican-keystone-listener/Dockerfile.j2 +++ b/docker/barbican/barbican-keystone-listener/Dockerfile.j2 @@ -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 %} diff --git a/docker/barbican/barbican-worker/Dockerfile.j2 b/docker/barbican/barbican-worker/Dockerfile.j2 index 8595e54cc..8e40f6e28 100644 --- a/docker/barbican/barbican-worker/Dockerfile.j2 +++ b/docker/barbican/barbican-worker/Dockerfile.j2 @@ -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 %} diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2 index e05d80218..6567dbdcf 100644 --- a/docker/bifrost/bifrost-base/Dockerfile.j2 +++ b/docker/bifrost/bifrost-base/Dockerfile.j2 @@ -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 diff --git a/docker/blazar/blazar-api/Dockerfile.j2 b/docker/blazar/blazar-api/Dockerfile.j2 index 35b191f45..ee10e13fb 100644 --- a/docker/blazar/blazar-api/Dockerfile.j2 +++ b/docker/blazar/blazar-api/Dockerfile.j2 @@ -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 diff --git a/docker/blazar/blazar-base/Dockerfile.j2 b/docker/blazar/blazar-base/Dockerfile.j2 index d2bddd4dc..5cca6e4d1 100644 --- a/docker/blazar/blazar-base/Dockerfile.j2 +++ b/docker/blazar/blazar-base/Dockerfile.j2 @@ -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 \ diff --git a/docker/blazar/blazar-manager/Dockerfile.j2 b/docker/blazar/blazar-manager/Dockerfile.j2 index e3f0e55f4..ea7b728be 100644 --- a/docker/blazar/blazar-manager/Dockerfile.j2 +++ b/docker/blazar/blazar-manager/Dockerfile.j2 @@ -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 %} diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index 0edcf2dc1..31931d148 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -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 diff --git a/docker/ceilometer/ceilometer-central/Dockerfile.j2 b/docker/ceilometer/ceilometer-central/Dockerfile.j2 index e0f20d253..cfc120e28 100644 --- a/docker/ceilometer/ceilometer-central/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-central/Dockerfile.j2 @@ -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 %} diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index e63d253b3..8421ab8ad 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -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 %} diff --git a/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 b/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 index 2614b5c33..0bcfba43b 100644 --- a/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 @@ -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")) }} diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 index b4b4be5f2..3624d2b12 100644 --- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 @@ -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 diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index a342d7636..aec2d674c 100644 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ b/docker/cinder/cinder-api/Dockerfile.j2 @@ -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 \ diff --git a/docker/cinder/cinder-backup/Dockerfile.j2 b/docker/cinder/cinder-backup/Dockerfile.j2 index 743852a25..d92c17896 100644 --- a/docker/cinder/cinder-backup/Dockerfile.j2 +++ b/docker/cinder/cinder-backup/Dockerfile.j2 @@ -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")) }} diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index 08b4ec51d..9503163b3 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/docker/cinder/cinder-base/Dockerfile.j2 @@ -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 diff --git a/docker/cinder/cinder-scheduler/Dockerfile.j2 b/docker/cinder/cinder-scheduler/Dockerfile.j2 index 8e01bafdc..15e7bc8f4 100644 --- a/docker/cinder/cinder-scheduler/Dockerfile.j2 +++ b/docker/cinder/cinder-scheduler/Dockerfile.j2 @@ -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 %} diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index 4bad98290..afc529ab5 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -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")) }} diff --git a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 index f49f43ecb..a0588dd48 100644 --- a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 @@ -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")) }} diff --git a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 index 483a2af42..641812846 100644 --- a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 @@ -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 \ diff --git a/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 index 136bfffbf..2a128c4e0 100644 --- a/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 @@ -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")) }} diff --git a/docker/cyborg/cyborg-api/Dockerfile.j2 b/docker/cyborg/cyborg-api/Dockerfile.j2 index e071f7a73..2863de3d6 100644 --- a/docker/cyborg/cyborg-api/Dockerfile.j2 +++ b/docker/cyborg/cyborg-api/Dockerfile.j2 @@ -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 diff --git a/docker/cyborg/cyborg-base/Dockerfile.j2 b/docker/cyborg/cyborg-base/Dockerfile.j2 index 9d60c7ab1..1373cb9b2 100644 --- a/docker/cyborg/cyborg-base/Dockerfile.j2 +++ b/docker/cyborg/cyborg-base/Dockerfile.j2 @@ -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 diff --git a/docker/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2 index 38b726aec..085fbd64c 100644 --- a/docker/designate/designate-api/Dockerfile.j2 +++ b/docker/designate/designate-api/Dockerfile.j2 @@ -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 %} diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2 index ccad55d73..385c4d57b 100644 --- a/docker/designate/designate-base/Dockerfile.j2 +++ b/docker/designate/designate-base/Dockerfile.j2 @@ -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 diff --git a/docker/designate/designate-central/Dockerfile.j2 b/docker/designate/designate-central/Dockerfile.j2 index e8f3addbd..b7c871297 100644 --- a/docker/designate/designate-central/Dockerfile.j2 +++ b/docker/designate/designate-central/Dockerfile.j2 @@ -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 diff --git a/docker/designate/designate-mdns/Dockerfile.j2 b/docker/designate/designate-mdns/Dockerfile.j2 index 13c22bf6f..6ad442bb3 100644 --- a/docker/designate/designate-mdns/Dockerfile.j2 +++ b/docker/designate/designate-mdns/Dockerfile.j2 @@ -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 %} diff --git a/docker/designate/designate-producer/Dockerfile.j2 b/docker/designate/designate-producer/Dockerfile.j2 index 2c08c6b53..3a2701931 100644 --- a/docker/designate/designate-producer/Dockerfile.j2 +++ b/docker/designate/designate-producer/Dockerfile.j2 @@ -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 %} diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2 index 07a743c00..aa2a25942 100644 --- a/docker/designate/designate-sink/Dockerfile.j2 +++ b/docker/designate/designate-sink/Dockerfile.j2 @@ -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 %} diff --git a/docker/designate/designate-worker/Dockerfile.j2 b/docker/designate/designate-worker/Dockerfile.j2 index 05432b37f..b050f87d0 100644 --- a/docker/designate/designate-worker/Dockerfile.j2 +++ b/docker/designate/designate-worker/Dockerfile.j2 @@ -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")) }} diff --git a/docker/freezer/freezer-api/Dockerfile.j2 b/docker/freezer/freezer-api/Dockerfile.j2 index 27651d6ef..3e393a0de 100644 --- a/docker/freezer/freezer-api/Dockerfile.j2 +++ b/docker/freezer/freezer-api/Dockerfile.j2 @@ -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 diff --git a/docker/freezer/freezer-base/Dockerfile.j2 b/docker/freezer/freezer-base/Dockerfile.j2 index 52cbecd1e..6cf186d57 100644 --- a/docker/freezer/freezer-base/Dockerfile.j2 +++ b/docker/freezer/freezer-base/Dockerfile.j2 @@ -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 diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2 index dbc19dcbc..c51a3b338 100644 --- a/docker/glance/glance-base/Dockerfile.j2 +++ b/docker/glance/glance-base/Dockerfile.j2 @@ -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 diff --git a/docker/gnocchi/gnocchi-api/Dockerfile.j2 b/docker/gnocchi/gnocchi-api/Dockerfile.j2 index 9d87bac6a..a0fdfea29 100644 --- a/docker/gnocchi/gnocchi-api/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-api/Dockerfile.j2 @@ -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 diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2 index 0b68c34f9..9465c9537 100644 --- a/docker/gnocchi/gnocchi-base/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2 @@ -11,53 +11,26 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.enable_extra_repos(['ceph']) }} -{% if install_type == 'binary' %} - -{# NOTE(mgoddard): EPEL required for python3-boto3 package on CentOS 8 #} -{{ macros.enable_extra_repos(['epel']) }} - - {% 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 %} +{% if base_package_type == 'rpm' %} -{{ 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', - ] %} + {% 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 diff --git a/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 b/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 index 4e188654f..26a29cab0 100644 --- a/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 @@ -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 %} diff --git a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 index ba641fe3b..d0c09e081 100644 --- a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 @@ -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 %} diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2 index bcedec273..42dd55199 100644 --- a/docker/heat/heat-api-cfn/Dockerfile.j2 +++ b/docker/heat/heat-api-cfn/Dockerfile.j2 @@ -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 diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2 index e69fe1da6..af9c5e0ad 100644 --- a/docker/heat/heat-api/Dockerfile.j2 +++ b/docker/heat/heat-api/Dockerfile.j2 @@ -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 diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2 index 1a1e2e3b9..bb26cf0c4 100644 --- a/docker/heat/heat-base/Dockerfile.j2 +++ b/docker/heat/heat-base/Dockerfile.j2 @@ -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 \ diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2 index 41efb0fc9..513021301 100644 --- a/docker/heat/heat-engine/Dockerfile.j2 +++ b/docker/heat/heat-engine/Dockerfile.j2 @@ -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 %} diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 6801b7aa0..5d97d6f94 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -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' %} -{{ macros.install_packages(horizon_packages | customizable("packages")) }} - -{% 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 %} + {% set horizon_packages = [ + 'gettext' + ] %} {{ macros.install_packages(horizon_packages | customizable("packages")) }} +{% elif base_package_type == 'deb' %} -{% 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 diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index e95f50caf..b36d06a0a 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -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 diff --git a/docker/ironic-inspector/Dockerfile.j2 b/docker/ironic-inspector/Dockerfile.j2 index 287b4956a..217dd8d66 100644 --- a/docker/ironic-inspector/Dockerfile.j2 +++ b/docker/ironic-inspector/Dockerfile.j2 @@ -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 \ diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2 index d90992ee0..7f4b8b880 100644 --- a/docker/ironic/ironic-api/Dockerfile.j2 +++ b/docker/ironic/ironic-api/Dockerfile.j2 @@ -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 diff --git a/docker/ironic/ironic-base/Dockerfile.j2 b/docker/ironic/ironic-base/Dockerfile.j2 index 9e83b3c69..41119c37b 100644 --- a/docker/ironic/ironic-base/Dockerfile.j2 +++ b/docker/ironic/ironic-base/Dockerfile.j2 @@ -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 \ diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index 5883f604f..63e48d1ea 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -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")) }} diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2 index 2176db3e1..fc5f814a2 100644 --- a/docker/keystone/keystone-base/Dockerfile.j2 +++ b/docker/keystone/keystone-base/Dockerfile.j2 @@ -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/* diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2 index 763d78d25..3c8df2e75 100644 --- a/docker/keystone/keystone/Dockerfile.j2 +++ b/docker/keystone/keystone/Dockerfile.j2 @@ -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 %} diff --git a/docker/kuryr/kuryr-base/Dockerfile.j2 b/docker/kuryr/kuryr-base/Dockerfile.j2 index bc5cb7571..64baa348b 100644 --- a/docker/kuryr/kuryr-base/Dockerfile.j2 +++ b/docker/kuryr/kuryr-base/Dockerfile.j2 @@ -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 diff --git a/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 b/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 index 333d71ccd..fe69b9f25 100644 --- a/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 +++ b/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 @@ -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 %} diff --git a/docker/magnum/magnum-api/Dockerfile.j2 b/docker/magnum/magnum-api/Dockerfile.j2 index 773d7bbbc..ddd16ea87 100644 --- a/docker/magnum/magnum-api/Dockerfile.j2 +++ b/docker/magnum/magnum-api/Dockerfile.j2 @@ -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 diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2 index 7da2016d7..8b0ebe23e 100644 --- a/docker/magnum/magnum-base/Dockerfile.j2 +++ b/docker/magnum/magnum-base/Dockerfile.j2 @@ -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 \ diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2 index d6393a1cb..df266ad5e 100644 --- a/docker/magnum/magnum-conductor/Dockerfile.j2 +++ b/docker/magnum/magnum-conductor/Dockerfile.j2 @@ -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 %} diff --git a/docker/manila/manila-api/Dockerfile.j2 b/docker/manila/manila-api/Dockerfile.j2 index b54367fbf..b5d70f9bb 100644 --- a/docker/manila/manila-api/Dockerfile.j2 +++ b/docker/manila/manila-api/Dockerfile.j2 @@ -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 \ diff --git a/docker/manila/manila-base/Dockerfile.j2 b/docker/manila/manila-base/Dockerfile.j2 index c7397346a..fe52c6d67 100644 --- a/docker/manila/manila-base/Dockerfile.j2 +++ b/docker/manila/manila-base/Dockerfile.j2 @@ -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 diff --git a/docker/manila/manila-data/Dockerfile.j2 b/docker/manila/manila-data/Dockerfile.j2 index 1c988186a..391ad2d52 100644 --- a/docker/manila/manila-data/Dockerfile.j2 +++ b/docker/manila/manila-data/Dockerfile.j2 @@ -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 %} diff --git a/docker/manila/manila-scheduler/Dockerfile.j2 b/docker/manila/manila-scheduler/Dockerfile.j2 index b2330ecb6..1af471946 100644 --- a/docker/manila/manila-scheduler/Dockerfile.j2 +++ b/docker/manila/manila-scheduler/Dockerfile.j2 @@ -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 %} diff --git a/docker/manila/manila-share/Dockerfile.j2 b/docker/manila/manila-share/Dockerfile.j2 index 68e853455..8ed170db4 100644 --- a/docker/manila/manila-share/Dockerfile.j2 +++ b/docker/manila/manila-share/Dockerfile.j2 @@ -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 %} +{% 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' + ] %} -{{ 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 %} +{% endif %} {{ macros.install_packages(manila_share_packages | customizable("packages")) }} -{% endif %} - {% block manila_share_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/masakari/masakari-api/Dockerfile.j2 b/docker/masakari/masakari-api/Dockerfile.j2 index 1e2ca75a3..c19f48c77 100644 --- a/docker/masakari/masakari-api/Dockerfile.j2 +++ b/docker/masakari/masakari-api/Dockerfile.j2 @@ -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 diff --git a/docker/masakari/masakari-base/Dockerfile.j2 b/docker/masakari/masakari-base/Dockerfile.j2 index cd558d053..5475306c0 100644 --- a/docker/masakari/masakari-base/Dockerfile.j2 +++ b/docker/masakari/masakari-base/Dockerfile.j2 @@ -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 \ diff --git a/docker/masakari/masakari-engine/Dockerfile.j2 b/docker/masakari/masakari-engine/Dockerfile.j2 index fc9dd8a9d..1d1119cd7 100644 --- a/docker/masakari/masakari-engine/Dockerfile.j2 +++ b/docker/masakari/masakari-engine/Dockerfile.j2 @@ -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 %} diff --git a/docker/masakari/masakari-monitors/Dockerfile.j2 b/docker/masakari/masakari-monitors/Dockerfile.j2 index 0a9c2d173..c6df1d0e8 100644 --- a/docker/masakari/masakari-monitors/Dockerfile.j2 +++ b/docker/masakari/masakari-monitors/Dockerfile.j2 @@ -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' %} + + {% 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', + ] %} - {% if base_package_type == 'rpm' %} - - {# not available #} - {% set masakari_base_packages = [ - ] %} - - {% elif base_package_type == 'deb' %} - - {% 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 %} diff --git a/docker/mistral/mistral-api/Dockerfile.j2 b/docker/mistral/mistral-api/Dockerfile.j2 index 36612f5a3..87994f864 100644 --- a/docker/mistral/mistral-api/Dockerfile.j2 +++ b/docker/mistral/mistral-api/Dockerfile.j2 @@ -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 diff --git a/docker/mistral/mistral-base/Dockerfile.j2 b/docker/mistral/mistral-base/Dockerfile.j2 index d2f608f59..dd48bd4b7 100644 --- a/docker/mistral/mistral-base/Dockerfile.j2 +++ b/docker/mistral/mistral-base/Dockerfile.j2 @@ -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 diff --git a/docker/mistral/mistral-engine/Dockerfile.j2 b/docker/mistral/mistral-engine/Dockerfile.j2 index 76b8990d5..a761f2993 100644 --- a/docker/mistral/mistral-engine/Dockerfile.j2 +++ b/docker/mistral/mistral-engine/Dockerfile.j2 @@ -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 %} diff --git a/docker/mistral/mistral-event-engine/Dockerfile.j2 b/docker/mistral/mistral-event-engine/Dockerfile.j2 index 92a720dd4..e44562e09 100644 --- a/docker/mistral/mistral-event-engine/Dockerfile.j2 +++ b/docker/mistral/mistral-event-engine/Dockerfile.j2 @@ -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 %} diff --git a/docker/mistral/mistral-executor/Dockerfile.j2 b/docker/mistral/mistral-executor/Dockerfile.j2 index 8d6571ed7..0b5eb35c2 100644 --- a/docker/mistral/mistral-executor/Dockerfile.j2 +++ b/docker/mistral/mistral-executor/Dockerfile.j2 @@ -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 %} diff --git a/docker/monasca/monasca-agent/Dockerfile.j2 b/docker/monasca/monasca-agent/Dockerfile.j2 index 24a7f6c96..6f5c7dd90 100644 --- a/docker/monasca/monasca-agent/Dockerfile.j2 +++ b/docker/monasca/monasca-agent/Dockerfile.j2 @@ -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 - diff --git a/docker/monasca/monasca-api/Dockerfile.j2 b/docker/monasca/monasca-api/Dockerfile.j2 index 9469908f3..5e83a6759 100644 --- a/docker/monasca/monasca-api/Dockerfile.j2 +++ b/docker/monasca/monasca-api/Dockerfile.j2 @@ -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 diff --git a/docker/monasca/monasca-base/Dockerfile.j2 b/docker/monasca/monasca-base/Dockerfile.j2 index bf4284efe..2ce6aed36 100644 --- a/docker/monasca/monasca-base/Dockerfile.j2 +++ b/docker/monasca/monasca-base/Dockerfile.j2 @@ -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 \ diff --git a/docker/monasca/monasca-notification/Dockerfile.j2 b/docker/monasca/monasca-notification/Dockerfile.j2 index e5bf0ea58..0899b95c5 100644 --- a/docker/monasca/monasca-notification/Dockerfile.j2 +++ b/docker/monasca/monasca-notification/Dockerfile.j2 @@ -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 - diff --git a/docker/monasca/monasca-persister/Dockerfile.j2 b/docker/monasca/monasca-persister/Dockerfile.j2 index a075ca8f4..9194768a0 100644 --- a/docker/monasca/monasca-persister/Dockerfile.j2 +++ b/docker/monasca/monasca-persister/Dockerfile.j2 @@ -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 - diff --git a/docker/monasca/monasca-thresh/Dockerfile.j2 b/docker/monasca/monasca-thresh/Dockerfile.j2 index acf5a9942..d4a7dcae4 100644 --- a/docker/monasca/monasca-thresh/Dockerfile.j2 +++ b/docker/monasca/monasca-thresh/Dockerfile.j2 @@ -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 diff --git a/docker/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2 index 8b7062c31..09fa9ec98 100644 --- a/docker/murano/murano-api/Dockerfile.j2 +++ b/docker/murano/murano-api/Dockerfile.j2 @@ -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 diff --git a/docker/murano/murano-base/Dockerfile.j2 b/docker/murano/murano-base/Dockerfile.j2 index 246301621..f09fb2f2b 100644 --- a/docker/murano/murano-base/Dockerfile.j2 +++ b/docker/murano/murano-base/Dockerfile.j2 @@ -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 \ diff --git a/docker/murano/murano-engine/Dockerfile.j2 b/docker/murano/murano-engine/Dockerfile.j2 index 73bd95717..bc433a580 100644 --- a/docker/murano/murano-engine/Dockerfile.j2 +++ b/docker/murano/murano-engine/Dockerfile.j2 @@ -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 %} diff --git a/docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2 b/docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2 index 10cf3d3d5..4261e4d2e 100644 --- a/docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2 +++ b/docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2 @@ -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 %} diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 9d597b6fe..3c07fa500 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -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' %} - - {% 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' - ] %} - - {% 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 %} +{% 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' + ] %} -{{ 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 diff --git a/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 b/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 index 7cb7cbfd9..76e7a5fea 100644 --- a/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 +++ b/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 @@ -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 %} diff --git a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 b/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 index 82d2b9484..11bcb432e 100644 --- a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 @@ -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")) }} diff --git a/docker/neutron/neutron-l3-agent/Dockerfile.j2 b/docker/neutron/neutron-l3-agent/Dockerfile.j2 index c7859a1a8..7aed7e2f6 100644 --- a/docker/neutron/neutron-l3-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-l3-agent/Dockerfile.j2 @@ -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 %} +{% 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")) }} -{% endif %} - {% block neutron_l3_agent_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 index 284754a76..ae37ac6e3 100644 --- a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 @@ -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")) }} diff --git a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 b/docker/neutron/neutron-metadata-agent/Dockerfile.j2 index 96e2fddd4..625636b7d 100644 --- a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-metadata-agent/Dockerfile.j2 @@ -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")) }} diff --git a/docker/neutron/neutron-metering-agent/Dockerfile.j2 b/docker/neutron/neutron-metering-agent/Dockerfile.j2 index e4950a084..1a4eda537 100644 --- a/docker/neutron/neutron-metering-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-metering-agent/Dockerfile.j2 @@ -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 %} diff --git a/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 b/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 index 5e28049e0..ec7243e57 100644 --- a/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 @@ -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 %} diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 index e35478a7a..82f02aeb2 100644 --- a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 @@ -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 %} diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2 index f1c4ee1e8..bde58cb26 100644 --- a/docker/neutron/neutron-server/Dockerfile.j2 +++ b/docker/neutron/neutron-server/Dockerfile.j2 @@ -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 diff --git a/docker/neutron/neutron-sriov-agent/Dockerfile.j2 b/docker/neutron/neutron-sriov-agent/Dockerfile.j2 index 6660296e3..6f43080a0 100644 --- a/docker/neutron/neutron-sriov-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-sriov-agent/Dockerfile.j2 @@ -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 %} diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2 index 28b645ab3..992a69325 100644 --- a/docker/nova/nova-api/Dockerfile.j2 +++ b/docker/nova/nova-api/Dockerfile.j2 @@ -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 nova_api_packages = [ - 'openstack-nova-api' - ] %} - -{{ 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 = [ - ] %} +{% 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 diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index ca1fe10b9..712d6ada9 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -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' + {% set nova_base_packages = [ + 'openvswitch', + 'python3-openvswitch' + ] %} + {% if base_arch == 'x86_64' %} + {% set nova_base_packages = nova_base_packages + [ + 'edk2-ovmf' ] %} - - {% 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' + {% 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 %} -{{ macros.install_packages(nova_base_packages | customizable("packages")) }} - -{% elif install_type == 'source' %} - {% if base_package_type == 'rpm' %} - - {% set nova_base_packages = [ - 'openvswitch', - 'python3-openvswitch' +{% 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' ] %} - {% 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', - 'python3-openvswitch' + {% elif base_arch == 'aarch64' %} + {% set nova_base_packages = nova_base_packages + [ + 'qemu-efi', ] %} - {% 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 %} +{% 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 \ diff --git a/docker/nova/nova-compute-ironic/Dockerfile.j2 b/docker/nova/nova-compute-ironic/Dockerfile.j2 index 1c5d7be37..e5d42e4e6 100644 --- a/docker/nova/nova-compute-ironic/Dockerfile.j2 +++ b/docker/nova/nova-compute-ironic/Dockerfile.j2 @@ -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 %} diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 9996afd0f..13edac23e 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -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' %} - - {% 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' +{% 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' ] %} - - # 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' %} - - {% 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' +{% 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' + ] %} + + {% 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 diff --git a/docker/nova/nova-conductor/Dockerfile.j2 b/docker/nova/nova-conductor/Dockerfile.j2 index 092f809d0..e497d2d7f 100644 --- a/docker/nova/nova-conductor/Dockerfile.j2 +++ b/docker/nova/nova-conductor/Dockerfile.j2 @@ -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 diff --git a/docker/nova/nova-novncproxy/Dockerfile.j2 b/docker/nova/nova-novncproxy/Dockerfile.j2 index 71e7ac37f..3fc35e71f 100644 --- a/docker/nova/nova-novncproxy/Dockerfile.j2 +++ b/docker/nova/nova-novncproxy/Dockerfile.j2 @@ -7,29 +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 nova_novncproxy_packages = [ - 'novnc', - 'openstack-nova-novncproxy' - ] %} - - {% elif base_package_type == 'deb' %} - - {% set nova_novncproxy_packages = [ - 'nova-novncproxy' - ] %} - - {% endif %} - -{% elif install_type == 'source' %} - - {% set nova_novncproxy_packages = [ - 'novnc' - ] %} - -{% endif %} +{% set nova_novncproxy_packages = [ + 'novnc' +] %} {{ macros.install_packages(nova_novncproxy_packages | customizable("packages")) }} diff --git a/docker/nova/nova-scheduler/Dockerfile.j2 b/docker/nova/nova-scheduler/Dockerfile.j2 index 303b3a728..765dc3840 100644 --- a/docker/nova/nova-scheduler/Dockerfile.j2 +++ b/docker/nova/nova-scheduler/Dockerfile.j2 @@ -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_scheduler_packages = [ - 'openstack-nova-scheduler' - ] %} - - {% elif base_package_type == 'deb' %} - - {% set nova_scheduler_packages = [ - 'nova-scheduler' - ] %} - - {% endif %} - -{{ macros.install_packages(nova_scheduler_packages | customizable("packages")) }} - -{% endif %} - {% block nova_scheduler_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/nova/nova-serialproxy/Dockerfile.j2 b/docker/nova/nova-serialproxy/Dockerfile.j2 index a22514b17..2c20ffdb8 100644 --- a/docker/nova/nova-serialproxy/Dockerfile.j2 +++ b/docker/nova/nova-serialproxy/Dockerfile.j2 @@ -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 nova_serialproxy_packages = [ - 'openstack-nova-serialproxy' - ] %} - {% elif base_package_type == 'deb' %} - {% set nova_serialproxy_packages = [ - 'nova-serialproxy' - ] %} - {% endif %} - -{{ macros.install_packages(nova_serialproxy_packages | customizable("packages")) }} - -{% endif %} - {% block nova_serialproxy_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 index 1351c48e5..e37af27df 100644 --- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 +++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 @@ -7,40 +7,20 @@ 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' %} +{% if base_package_type == 'rpm' %} - {% set nova_spicehtml5proxy_packages = [ - 'openstack-nova-spicehtml5proxy', - 'python3-numpy', - 'spice-html5' - ] %} + {% set nova_spicehtml5proxy_packages = [ + 'python3-numpy', + 'spice-html5' + ] %} - {% elif base_package_type == 'deb' %} +{% elif base_package_type == 'deb' %} - {% set nova_spicehtml5proxy_packages = [ - 'nova-spiceproxy', - 'websockify' - ] %} + {% set nova_spicehtml5proxy_packages = [ + 'spice-html5', + 'websockify' + ] %} - {% endif %} - -{% elif install_type == 'source' %} - {% if base_package_type == 'rpm' %} - - {% set nova_spicehtml5proxy_packages = [ - 'python3-numpy', - 'spice-html5' - ] %} - - {% elif base_package_type == 'deb' %} - - {% set nova_spicehtml5proxy_packages = [ - 'spice-html5', - 'websockify' - ] %} - - {% endif %} {% endif %} {{ macros.install_packages(nova_spicehtml5proxy_packages | customizable("packages")) }} diff --git a/docker/octavia/octavia-api/Dockerfile.j2 b/docker/octavia/octavia-api/Dockerfile.j2 index 839bcccc1..f22b74f71 100644 --- a/docker/octavia/octavia-api/Dockerfile.j2 +++ b/docker/octavia/octavia-api/Dockerfile.j2 @@ -7,42 +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 == 'rpm' %} - {% set octavia_api_packages = [ - 'openstack-octavia-api', - 'python3-ovn-octavia-provider' - ] %} - {% elif base_package_type == 'deb' %} - {% set octavia_api_packages = [ - 'octavia-api' - ] %} - - {% if base_distro == 'debian' %} - {% set octavia_api_packages = octavia_api_packages + [ - 'python3-networking-ovn' - ] %} - {% elif base_distro == 'ubuntu' %} - {% set octavia_api_packages = octavia_api_packages + [ - 'python3-ovn-octavia-provider' - ] %} - {% endif %} - - {% endif %} - -{% elif install_type == 'source' %} - {% set octavia_api_packages = [ - ] %} - - {% set octavia_api_plugins_pip_packages = [ - '/plugins/*' - ] %} +{% set octavia_api_packages = [ +] %} + +{% set octavia_api_plugins_pip_packages = [ + '/plugins/*' +] %} ADD plugins-archive / RUN if [ "$(ls /plugins)" ]; then \ {{ macros.install_pip(octavia_api_plugins_pip_packages) }} ; \ fi -{% endif %} {{ macros.install_packages(octavia_api_packages | customizable("packages")) }} diff --git a/docker/octavia/octavia-base/Dockerfile.j2 b/docker/octavia/octavia-base/Dockerfile.j2 index 42a4dc011..a1d28846d 100644 --- a/docker/octavia/octavia-base/Dockerfile.j2 +++ b/docker/octavia/octavia-base/Dockerfile.j2 @@ -10,23 +10,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.enable_extra_repos(['openvswitch']) }} {{ macros.configure_user(name='octavia') }} -{% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} - {% set octavia_base_packages = [ - 'openstack-octavia-common' - ] %} - {% elif base_package_type == 'deb' %} - {% set octavia_base_packages = [ - 'octavia-common' - ] %} - {% endif %} - -{{ macros.install_packages(octavia_base_packages | customizable("packages")) }} - -{% elif install_type == 'source' %} - {% set octavia_base_packages = [ - 'python3-openvswitch' - ] %} +{% set octavia_base_packages = [ + 'python3-openvswitch' +] %} {{ macros.install_packages(octavia_base_packages | customizable("packages")) }} @@ -41,7 +27,6 @@ RUN ln -s /octavia-base-source/* octavia \ && mkdir -p /etc/octavia \ && cp -r /octavia/etc/* /etc/octavia/ \ && chown -R octavia: /etc/octavia -{% endif %} COPY extend_start.sh /usr/local/bin/kolla_extend_start diff --git a/docker/octavia/octavia-driver-agent/Dockerfile.j2 b/docker/octavia/octavia-driver-agent/Dockerfile.j2 index 68365cabd..cafbe97a2 100644 --- a/docker/octavia/octavia-driver-agent/Dockerfile.j2 +++ b/docker/octavia/octavia-driver-agent/Dockerfile.j2 @@ -7,25 +7,12 @@ 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 octavia_driver_agent_packages = [ - 'python3-ovn-octavia-provider' - ] %} - {% elif base_package_type == 'deb' %} - {% set octavia_driver_agent_packages = [ - 'octavia-driver-agent', - 'python3-ovn-octavia-provider' - ] %} - {% endif %} - -{% elif install_type == 'source' %} - {% set octavia_driver_agent_packages = [ - ] %} - - {% set octavia_driver_agent_plugins_pip_packages = [ - '/plugins/*' - ] %} +{% set octavia_driver_agent_packages = [ +] %} + +{% set octavia_driver_agent_plugins_pip_packages = [ + '/plugins/*' +] %} {{ macros.install_packages(octavia_driver_agent_packages | customizable("packages")) }} @@ -33,7 +20,6 @@ ADD plugins-archive / RUN if [ "$(ls /plugins)" ]; then \ {{ macros.install_pip(octavia_driver_agent_plugins_pip_packages) }} ; \ fi -{% endif %} {% block octavia_driver_agent_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/octavia/octavia-health-manager/Dockerfile.j2 b/docker/octavia/octavia-health-manager/Dockerfile.j2 index 57a0868e2..ec797f12c 100644 --- a/docker/octavia/octavia-health-manager/Dockerfile.j2 +++ b/docker/octavia/octavia-health-manager/Dockerfile.j2 @@ -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 octavia_health_manager_packages = [ - 'openstack-octavia-health-manager' - ] %} - {% elif base_package_type == 'deb' %} - {% set octavia_health_manager_packages = [ - 'octavia-health-manager' - ] %} - {% endif %} - -{{ macros.install_packages(octavia_health_manager_packages | customizable("packages")) }} - -{% endif %} - {% block octavia_health_manager_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/octavia/octavia-housekeeping/Dockerfile.j2 b/docker/octavia/octavia-housekeeping/Dockerfile.j2 index 90fefeffc..001b73c3a 100644 --- a/docker/octavia/octavia-housekeeping/Dockerfile.j2 +++ b/docker/octavia/octavia-housekeeping/Dockerfile.j2 @@ -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 octavia_housekeeping_packages = [ - 'openstack-octavia-housekeeping' - ] %} - {% elif base_package_type == 'deb' %} - {% set octavia_housekeeping_packages = [ - 'octavia-housekeeping' - ] %} - {% endif %} - -{{ macros.install_packages(octavia_housekeeping_packages | customizable("packages")) }} - -{% endif %} - {% block octavia_housekeeping_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/octavia/octavia-worker/Dockerfile.j2 b/docker/octavia/octavia-worker/Dockerfile.j2 index 741bef1ee..8287c9375 100644 --- a/docker/octavia/octavia-worker/Dockerfile.j2 +++ b/docker/octavia/octavia-worker/Dockerfile.j2 @@ -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 octavia_worker_packages = [ - 'openstack-octavia-worker' - ] %} - {% elif base_package_type == 'deb' %} - {% set octavia_worker_packages = [ - 'octavia-worker' - ] %} - {% endif %} - -{{ macros.install_packages(octavia_worker_packages | customizable("packages")) }} - -{% endif %} - {% block octavia_worker_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index afc724214..fc258a73a 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -10,182 +10,51 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.add_binary_source_envs() }} {{ macros.enable_extra_repos(['opstools', 'powertools']) }} -{% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} - - {% set openstack_base_packages = [ - 'avahi-libs', - 'gnutls', - 'httpd', - 'initscripts', - 'libxslt', - 'libyaml', - 'mailcap', - 'mod_ssl', - 'openssl', - 'python3-PyYAML', - 'python3-alembic', - 'python3-aodhclient', - 'python3-barbicanclient', - 'python3-cachetools', - 'python3-cloudkittyclient', - 'python3-contextlib2', - 'python3-cryptography', - 'python3-designateclient', - 'python3-elasticsearch', - 'python3-eventlet', - 'python3-extras', - 'python3-glanceclient', - 'python3-gnocchiclient', - 'python3-heatclient', - 'python3-httplib2', - 'python3-ironicclient', - 'python3-iso8601', - 'python3-kazoo', - 'python3-keystoneauth1', - 'python3-keystoneclient', - 'python3-keystonemiddleware', - 'python3-logutils', - 'python3-lxml', - 'python3-magnumclient', - 'python3-manilaclient', - 'python3-migrate', - 'python3-mimeparse', - 'python3-mistralclient', - 'python3-mod_wsgi', - 'python3-muranoclient', - 'python3-neutronclient', - 'python3-novaclient', - 'python3-openstackclient', - 'python3-oslo-cache', - 'python3-oslo-concurrency', - 'python3-oslo-config', - 'python3-oslo-context', - 'python3-oslo-db', - 'python3-oslo-i18n', - 'python3-oslo-log', - 'python3-oslo-messaging', - 'python3-oslo-middleware', - 'python3-oslo-policy', - 'python3-oslo-reports', - 'python3-oslo-rootwrap', - 'python3-oslo-serialization', - 'python3-oslo-service', - 'python3-oslo-upgradecheck', - 'python3-oslo-utils', - 'python3-oslo-versionedobjects', - 'python3-osprofiler', - 'python3-paramiko', - 'python3-paste-deploy', - 'python3-pbr', - 'python3-posix_ipc', - 'python3-prettytable', - 'python3-psycopg2', - 'python3-pyasn1', - 'python3-redis', - 'python3-retrying', - 'python3-routes', - 'python3-saharaclient', - 'python3-sqlalchemy', - 'python3-sqlparse', - 'python3-swiftclient', - 'python3-sysv_ipc', - 'python3-tooz', - 'python3-troveclient', - 'python3-vitrageclient', - 'python3-webob', - 'systemd-sysv' - ] %} - - {% elif base_package_type == 'deb' %} - -# This will prevent questions from being asked during the install -ENV DEBIAN_FRONTEND noninteractive - {% set openstack_base_packages = [ - 'apache2', - 'libapache2-mod-wsgi-py3', - 'openssl', - 'patch', - 'python3-aodhclient', - 'python3-barbicanclient', - 'python3-designateclient', - 'python3-elasticsearch', - 'python3-etcd', - 'python3-etcd3gw', - 'python3-gnocchiclient', - 'python3-heatclient', - 'python3-ironicclient', - 'python3-kazoo', - 'python3-keystoneclient', - 'python3-magnumclient', - 'python3-manilaclient', - 'python3-memcache', - 'python3-mistralclient', - 'python3-muranoclient', - 'python3-openstackclient', - 'python3-oslo.log', - 'python3-osprofiler', - 'python3-psycopg2', - 'python3-pymemcache', - 'python3-pymysql', - 'python3-pyngus', - 'python3-redis', - 'python3-saharaclient', - 'python3-sysv-ipc', - 'python3-swiftclient', - 'python3-troveclient', - 'python3-zake', - ] %} - {% endif %} - -{{ macros.install_packages(openstack_base_packages | customizable("packages")) }} - -{% elif install_type == 'source' %} - {% if base_package_type == 'rpm' %} - {% set openstack_base_packages = [ - 'gcc', - 'gcc-c++', - 'git', - 'httpd', - 'iproute', - 'libffi-devel', - 'libxml2-devel', - 'libxslt-devel', - 'libyaml-devel', - 'make', - 'mod_ssl', - 'openssl', - 'openssl-devel', - 'pcre-devel', - 'postgresql', - 'postgresql-devel', - 'python3-devel', - 'python3-mod_wsgi', - 'sqlite-devel', - 'zip' - ] %} +{% if base_package_type == 'rpm' %} + {% set openstack_base_packages = [ + 'gcc', + 'gcc-c++', + 'git', + 'httpd', + 'iproute', + 'libffi-devel', + 'libxml2-devel', + 'libxslt-devel', + 'libyaml-devel', + 'make', + 'mod_ssl', + 'openssl', + 'openssl-devel', + 'pcre-devel', + 'postgresql', + 'postgresql-devel', + 'python3-devel', + 'python3-mod_wsgi', + 'sqlite-devel', + 'zip' + ] %} - {% elif base_package_type == 'deb' %} - {% set openstack_base_packages = [ - 'apache2', - 'build-essential', - 'ca-certificates', - 'git', - 'libapache2-mod-wsgi-py3', - 'libffi-dev', - 'libpcre3-dev', - 'libpq-dev', - 'libssl-dev', - 'libxml2-dev', - 'libxslt1-dev', - 'libyaml-dev', - 'libz-dev', - 'pkg-config', - 'python3-dev', - 'zip' - ] %} +{% elif base_package_type == 'deb' %} + {% set openstack_base_packages = [ + 'apache2', + 'build-essential', + 'ca-certificates', + 'git', + 'libapache2-mod-wsgi-py3', + 'libffi-dev', + 'libpcre3-dev', + 'libpq-dev', + 'libssl-dev', + 'libxml2-dev', + 'libxslt1-dev', + 'libyaml-dev', + 'libz-dev', + 'pkg-config', + 'python3-dev', + 'zip' + ] %} - {% endif %} +{% endif %} {{ macros.enable_extra_repos(['powertools']) }} {{ macros.install_packages(openstack_base_packages | customizable("packages")) }} @@ -331,8 +200,6 @@ ENV PATH /var/lib/kolla/venv/bin:$PATH RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools']) }} \ && {{ macros.install_pip(openstack_base_pip_packages | customizable("pip_packages")) }} -{% endif %} - {% if base_package_type == 'rpm' %} RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf diff --git a/docker/placement/placement-api/Dockerfile.j2 b/docker/placement/placement-api/Dockerfile.j2 index c91179c59..76e1459be 100644 --- a/docker/placement/placement-api/Dockerfile.j2 +++ b/docker/placement/placement-api/Dockerfile.j2 @@ -7,31 +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 placement_api_packages = [ - 'openstack-placement-api' - ] %} - -{{ macros.install_packages(placement_api_packages | customizable("packages")) }} - - {% elif base_package_type == 'deb' %} - - {% set placement_api_packages = [ - 'placement-api' - ] %} - -{{ macros.install_packages(placement_api_packages | customizable("packages")) }} -RUN rm -f /etc/apache2/sites-enabled/placement-api.conf - - {% endif %} -{% elif install_type == 'source' %} - - {% set placement_api_packages = [ - ] %} +{% set placement_api_packages = [ +] %} {{ macros.install_packages(placement_api_packages | customizable("packages")) }} -{% endif %} COPY extend_start.sh /usr/local/bin/kolla_placement_extend_start diff --git a/docker/placement/placement-base/Dockerfile.j2 b/docker/placement/placement-base/Dockerfile.j2 index 55ca9d141..b2230f0f4 100644 --- a/docker/placement/placement-base/Dockerfile.j2 +++ b/docker/placement/placement-base/Dockerfile.j2 @@ -9,37 +9,17 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='placement') }} -{% if install_type == 'binary' %} +{% if base_package_type == 'rpm' %} - {% if base_package_type == 'rpm' %} + {% set placement_base_packages = [ + ] %} - {% set placement_base_packages = [ - 'openstack-placement-common', - ] %} +{% elif base_package_type == 'deb' %} - {% elif base_package_type == 'deb' %} + {% set placement_base_packages = [ + ] %} - {% set placement_base_packages = [ - 'placement-common', - ] %} - - {% endif %} - -{{ macros.install_packages(placement_base_packages | customizable("packages")) }} - -{% elif install_type == 'source' %} - - {% if base_package_type == 'rpm' %} - - {% set placement_base_packages = [ - ] %} - - {% elif base_package_type == 'deb' %} - - {% set placement_base_packages = [ - ] %} - - {% endif %} +{% endif %} {{ macros.install_packages(placement_base_packages | customizable("packages")) }} @@ -56,8 +36,6 @@ RUN ln -s placement-base-source/* placement \ && cp -r /placement/etc/placement/* /etc/placement/ \ && chown -R placement: /etc/placement/ -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN touch /usr/local/bin/kolla_placement_extend_start \ diff --git a/docker/sahara/sahara-api/Dockerfile.j2 b/docker/sahara/sahara-api/Dockerfile.j2 index 60c4cd149..aafab3ba6 100644 --- a/docker/sahara/sahara-api/Dockerfile.j2 +++ b/docker/sahara/sahara-api/Dockerfile.j2 @@ -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 sahara_api_packages = ['openstack-sahara-api'] %} - {% elif base_package_type == 'deb' %} - {% set sahara_api_packages = ['sahara-api'] %} - {% endif %} -{{ macros.install_packages(sahara_api_packages | customizable("packages")) }} -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_sahara_extend_start RUN chmod 755 /usr/local/bin/kolla_sahara_extend_start diff --git a/docker/sahara/sahara-base/Dockerfile.j2 b/docker/sahara/sahara-base/Dockerfile.j2 index 5d7d7a5e5..1204d4a04 100644 --- a/docker/sahara/sahara-base/Dockerfile.j2 +++ b/docker/sahara/sahara-base/Dockerfile.j2 @@ -9,25 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='sahara') }} -{% if install_type == 'binary' %} - -{% if base_package_type == 'rpm' %} - {% set sahara_base_packages = [ - 'openstack-sahara-common', - 'python3-sahara-plugin-ambari', - 'python3-sahara-plugin-cdh', - 'python3-sahara-plugin-mapr', - 'python3-sahara-plugin-spark', - 'python3-sahara-plugin-storm', - 'python3-sahara-plugin-vanilla' - ] %} -{% elif base_package_type == 'deb' %} - {% set sahara_base_packages = ['sahara-common'] %} -{% endif %} -{{ macros.install_packages(sahara_base_packages | customizable("packages")) }} - -{% elif install_type == 'source' %} - {% if base_package_type == 'rpm' %} {% set sahara_base_packages = ['openssh'] %} {% elif base_package_type == 'deb' %} @@ -55,8 +36,6 @@ RUN ln -s sahara-base-source/* sahara \ && chown -R sahara: /etc/sahara \ && 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/sahara/rootwrap.conf -{% endif %} - COPY sahara_sudoers /etc/sudoers.d/kolla_sahara_sudoers COPY extend_start.sh /usr/local/bin/kolla_extend_start diff --git a/docker/sahara/sahara-engine/Dockerfile.j2 b/docker/sahara/sahara-engine/Dockerfile.j2 index 26c0562da..02c0ca02b 100644 --- a/docker/sahara/sahara-engine/Dockerfile.j2 +++ b/docker/sahara/sahara-engine/Dockerfile.j2 @@ -7,24 +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 sahara_engine_packages = [ - 'nc', - 'openstack-sahara-engine', - ] %} - {% elif base_package_type == 'deb' %} - {% set sahara_engine_packages = [ - 'netcat', - 'sahara-engine', - ] %} - {% endif %} -{% elif install_type == 'source' %} - {% if base_package_type == 'rpm' %} - {% set sahara_engine_packages = ['nc'] %} - {% elif base_package_type == 'deb' %} - {% set sahara_engine_packages = ['netcat'] %} - {% endif %} +{% if base_package_type == 'rpm' %} + {% set sahara_engine_packages = ['nc'] %} +{% elif base_package_type == 'deb' %} + {% set sahara_engine_packages = ['netcat'] %} {% endif %} {{ macros.install_packages(sahara_engine_packages | customizable("packages")) }} diff --git a/docker/senlin/senlin-api/Dockerfile.j2 b/docker/senlin/senlin-api/Dockerfile.j2 index 49b95191c..d7e8f6abd 100644 --- a/docker/senlin/senlin-api/Dockerfile.j2 +++ b/docker/senlin/senlin-api/Dockerfile.j2 @@ -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 == 'rpm' %} - {% set senlin_api_packages = ['openstack-senlin-api'] %} - - {% elif base_package_type == 'deb' %} - {% set senlin_api_packages = ['senlin-api'] %} - {% endif %} - -{{ macros.install_packages(senlin_api_packages | customizable("packages")) }} - -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_senlin_extend_start RUN chmod 755 /usr/local/bin/kolla_senlin_extend_start diff --git a/docker/senlin/senlin-base/Dockerfile.j2 b/docker/senlin/senlin-base/Dockerfile.j2 index 9ee4a8b53..17adf0f4c 100644 --- a/docker/senlin/senlin-base/Dockerfile.j2 +++ b/docker/senlin/senlin-base/Dockerfile.j2 @@ -9,18 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='senlin') }} -{% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} - {% set senlin_base_packages = ['openstack-senlin-common'] %} - - {% elif base_package_type == 'deb' %} - {% set senlin_base_packages = ['senlin-common'] %} - {% endif %} - -{{ macros.install_packages(senlin_base_packages | customizable("packages")) }} - -{% elif install_type == 'source' %} - ADD senlin-base-archive /senlin-base-source {% set senlin_base_pip_packages = [ @@ -33,8 +21,6 @@ RUN ln -s senlin-base-source/* senlin \ && cp -r /senlin/etc/senlin/* /etc/senlin \ && chown -R senlin: /etc/senlin -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN touch /usr/local/bin/kolla_senlin_extend_start \ diff --git a/docker/senlin/senlin-conductor/Dockerfile.j2 b/docker/senlin/senlin-conductor/Dockerfile.j2 index 61d3a4e84..a4dd6bc5f 100644 --- a/docker/senlin/senlin-conductor/Dockerfile.j2 +++ b/docker/senlin/senlin-conductor/Dockerfile.j2 @@ -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 == 'rpm' %} - {% set senlin_conductor_packages = ['openstack-senlin-conductor'] %} - - {% elif base_package_type == 'deb' %} - {% set senlin_conductor_packages = ['senlin-conductor'] %} - {% endif %} - -{{ macros.install_packages(senlin_conductor_packages | customizable("packages")) }} - -{% endif %} - {% block senlin_conductor_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/senlin/senlin-engine/Dockerfile.j2 b/docker/senlin/senlin-engine/Dockerfile.j2 index 8bc46f871..f3a9eac25 100644 --- a/docker/senlin/senlin-engine/Dockerfile.j2 +++ b/docker/senlin/senlin-engine/Dockerfile.j2 @@ -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 == 'rpm' %} - {% set senlin_engine_packages = ['openstack-senlin-engine'] %} - - {% elif base_package_type == 'deb' %} - {% set senlin_engine_packages = ['senlin-engine'] %} - {% endif %} - -{{ macros.install_packages(senlin_engine_packages | customizable("packages")) }} - -{% endif %} - {% block senlin_engine_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/senlin/senlin-health-manager/Dockerfile.j2 b/docker/senlin/senlin-health-manager/Dockerfile.j2 index 25f476180..8a37b2beb 100644 --- a/docker/senlin/senlin-health-manager/Dockerfile.j2 +++ b/docker/senlin/senlin-health-manager/Dockerfile.j2 @@ -5,20 +5,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block senlin_health_manager_header %}{% endblock %} -{% import "macros.j2" as macros with context %} - -{% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} - {% set senlin_health_manager_packages = ['openstack-senlin-health-manager'] %} - - {% elif base_package_type == 'deb' %} - {% set senlin_health_manager_packages = ['senlin-health-manager'] %} - {% endif %} - -{{ macros.install_packages(senlin_health_manager_packages | customizable("packages")) }} - -{% endif %} - {% block senlin_health_manager_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/solum/solum-api/Dockerfile.j2 b/docker/solum/solum-api/Dockerfile.j2 index c47460543..06fbb038c 100644 --- a/docker/solum/solum-api/Dockerfile.j2 +++ b/docker/solum/solum-api/Dockerfile.j2 @@ -5,13 +5,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block solum_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_solum_extend_start RUN chmod 755 /usr/local/bin/kolla_solum_extend_start diff --git a/docker/solum/solum-base/Dockerfile.j2 b/docker/solum/solum-base/Dockerfile.j2 index 9a7d252ad..050d73d58 100644 --- a/docker/solum/solum-base/Dockerfile.j2 +++ b/docker/solum/solum-base/Dockerfile.j2 @@ -9,13 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='solum') }} -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% elif install_type == 'source' %} - ADD solum-base-archive /solum-base-source {% set solum_base_pip_packages = [ @@ -28,8 +21,6 @@ RUN ln -s solum-base-source/* solum \ && cp -r /solum/etc/solum/* /etc/solum/ \ && chown -R solum: /etc/solum -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN touch /usr/local/bin/kolla_solum_extend_start \ diff --git a/docker/solum/solum-conductor/Dockerfile.j2 b/docker/solum/solum-conductor/Dockerfile.j2 index 28298a7d1..b5adbbd08 100644 --- a/docker/solum/solum-conductor/Dockerfile.j2 +++ b/docker/solum/solum-conductor/Dockerfile.j2 @@ -5,13 +5,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block solum_conductor_header %}{% endblock %} -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% endif %} - {% block solum_conductor_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/solum/solum-deployer/Dockerfile.j2 b/docker/solum/solum-deployer/Dockerfile.j2 index d8998572e..50ad84752 100644 --- a/docker/solum/solum-deployer/Dockerfile.j2 +++ b/docker/solum/solum-deployer/Dockerfile.j2 @@ -5,13 +5,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block solum_deployer_header %}{% endblock %} -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% endif %} - {% block solum_deployer_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/solum/solum-worker/Dockerfile.j2 b/docker/solum/solum-worker/Dockerfile.j2 index 69d02de28..049a33dd6 100644 --- a/docker/solum/solum-worker/Dockerfile.j2 +++ b/docker/solum/solum-worker/Dockerfile.j2 @@ -5,13 +5,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block solum_worker_header %}{% endblock %} -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% endif %} - {% block solum_worker_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/swift/swift-account/Dockerfile.j2 b/docker/swift/swift-account/Dockerfile.j2 index 8ad7ce9f6..592fdb672 100644 --- a/docker/swift/swift-account/Dockerfile.j2 +++ b/docker/swift/swift-account/Dockerfile.j2 @@ -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 swift_acount_packages = ['openstack-swift-account'] %} - {% elif base_package_type == 'deb' %} - {% set swift_acount_packages = ['swift-account'] %} - {% endif %} - -{{ macros.install_packages(swift_acount_packages | customizable("packages")) }} - -{% endif %} - {% block swift_account_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2 index 6ef3db124..98e10a2e6 100644 --- a/docker/swift/swift-base/Dockerfile.j2 +++ b/docker/swift/swift-base/Dockerfile.j2 @@ -9,39 +9,18 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='swift') }} -{% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} - {% set swift_base_packages = [ - 'nmap-ncat', - 'openstack-swift', - ] %} - {% elif base_package_type == 'deb' %} - {% set swift_base_packages = [ - 'netcat-openbsd', - 'rsync', - 'swift', - ] %} - {% endif %} - -{{ macros.install_packages(swift_base_packages | customizable("packages")) }} - {# NOTE(mgoddard): UCA packages seem to modify the group membership for #} - {# the swift user, removing it from the kolla group. #} - {% if base_package_type == 'deb' %} -RUN usermod --append --groups kolla swift - {% endif %} -{% elif install_type == 'source' %} - {% if base_package_type == 'rpm' %} - {% set swift_base_packages = [ - 'liberasurecode-devel', - 'nmap-ncat', - ] %} - {% elif base_package_type == 'deb' %} - {% set swift_base_packages = [ - 'liberasurecode-dev', - 'netcat-openbsd', - 'rsync', - ] %} - {% endif %} +{% if base_package_type == 'rpm' %} + {% set swift_base_packages = [ + 'liberasurecode-devel', + 'nmap-ncat', + ] %} +{% elif base_package_type == 'deb' %} + {% set swift_base_packages = [ + 'liberasurecode-dev', + 'netcat-openbsd', + 'rsync', + ] %} +{% endif %} {{ macros.install_packages(swift_base_packages | customizable("packages")) }} @@ -56,7 +35,6 @@ RUN ln -s swift-base-source/* swift \ && mkdir -p /etc/swift /var/cache/swift /var/lock/swift \ && cp -r /swift/etc/* /etc/swift/ \ && chown -R swift: /etc/swift /var/cache/swift /var/lock/swift -{% endif %} COPY swift-rootwrap /var/lib/kolla/venv/bin/swift-rootwrap COPY rootwrap.conf /etc/swift/rootwrap.conf diff --git a/docker/swift/swift-container/Dockerfile.j2 b/docker/swift/swift-container/Dockerfile.j2 index 4d8532f72..efeef1a65 100644 --- a/docker/swift/swift-container/Dockerfile.j2 +++ b/docker/swift/swift-container/Dockerfile.j2 @@ -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 swift_container_packages = ['openstack-swift-container'] %} - {% elif base_package_type == 'deb' %} - {% set swift_container_packages = ['swift-container'] %} - {% endif %} - -{{ macros.install_packages(swift_container_packages | customizable("packages")) }} - -{% endif %} - {% block swift_container_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/swift/swift-object-expirer/Dockerfile.j2 b/docker/swift/swift-object-expirer/Dockerfile.j2 index dac92d375..7b2d9efd5 100644 --- a/docker/swift/swift-object-expirer/Dockerfile.j2 +++ b/docker/swift/swift-object-expirer/Dockerfile.j2 @@ -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 == 'rpm' %} - # RDO packages swift-object-expirer in openstack-swift-proxy - {% set swift_object_expirer_packages = ['openstack-swift-proxy'] %} - {% elif base_package_type == 'deb' %} - {% set swift_object_expirer_packages = ['swift-object-expirer'] %} - {% endif %} - -{{ macros.install_packages(swift_object_expirer_packages | customizable("packages")) }} - -{% endif %} - {% block swift_object_expirer_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/swift/swift-object/Dockerfile.j2 b/docker/swift/swift-object/Dockerfile.j2 index 67040e51e..ef32e6879 100644 --- a/docker/swift/swift-object/Dockerfile.j2 +++ b/docker/swift/swift-object/Dockerfile.j2 @@ -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 swift_object_packages = ['openstack-swift-object'] %} - {% elif base_package_type == 'deb' %} - {% set swift_object_packages = ['swift-object'] %} - {% endif %} - -{{ macros.install_packages(swift_object_packages | customizable("packages")) }} - -{% endif %} - {% block swift_object_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2 index 4d57b32e3..a73dd61e5 100644 --- a/docker/swift/swift-proxy-server/Dockerfile.j2 +++ b/docker/swift/swift-proxy-server/Dockerfile.j2 @@ -7,31 +7,12 @@ 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 swift_proxy_server_packages = [ - 'openstack-swift-proxy', - 'python3-ceilometermiddleware' - ] %} - {% elif base_package_type == 'deb' %} - {% set swift_proxy_server_packages = [ - 'swift-proxy', - 'python3-ceilometermiddleware' - ] %} - {% endif %} - -{{ macros.install_packages(swift_proxy_server_packages | customizable("packages")) }} - -{% elif install_type == 'source' %} - {% set swift_proxy_server_pip_packages = [ 'ceilometermiddleware' ] %} RUN {{ macros.install_pip(swift_proxy_server_pip_packages | customizable("pip_packages")) }} -{% endif %} - {% block swift_proxy_server_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/tacker/tacker-base/Dockerfile.j2 b/docker/tacker/tacker-base/Dockerfile.j2 index 4f6733328..b728b16da 100644 --- a/docker/tacker/tacker-base/Dockerfile.j2 +++ b/docker/tacker/tacker-base/Dockerfile.j2 @@ -10,25 +10,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.enable_extra_repos(['openvswitch']) }} {{ macros.configure_user(name='tacker') }} -{% if install_type == 'binary' %} - - {% if base_package_type == 'rpm' %} - {% set tacker_base_packages = [ - 'openstack-tacker-common', - 'python3-networking-sfc' - ] %} - - {% elif base_package_type == 'deb' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - - {% endif %} - -{{ macros.install_packages(tacker_base_packages | customizable("packages")) }} - -{% elif install_type == 'source' %} - ADD tacker-base-archive /tacker-base-source ADD plugins-archive / @@ -49,8 +30,6 @@ RUN ln -s tacker-base-source/* tacker \ {{ macros.install_pip(tacker_base_plugins_pip_packages) }}; \ fi -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN touch /usr/local/bin/kolla_tacker_extend_start \ diff --git a/docker/tacker/tacker-conductor/Dockerfile.j2 b/docker/tacker/tacker-conductor/Dockerfile.j2 index f540cc5d6..48e3cd38c 100644 --- a/docker/tacker/tacker-conductor/Dockerfile.j2 +++ b/docker/tacker/tacker-conductor/Dockerfile.j2 @@ -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 tacker_conductor_packages = [ - 'openstack-tacker' - ] %} - - {% elif base_package_type == 'deb' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - - {% endif %} - -{{ macros.install_packages(tacker_conductor_packages | customizable("packages")) }} - -{% endif %} - {% block tacker_conductor_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/tacker/tacker-server/Dockerfile.j2 b/docker/tacker/tacker-server/Dockerfile.j2 index dd8460ce5..3e13a02e8 100644 --- a/docker/tacker/tacker-server/Dockerfile.j2 +++ b/docker/tacker/tacker-server/Dockerfile.j2 @@ -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 tacker_server_packages = [ - 'openstack-tacker' - ] %} - - {% elif base_package_type == 'deb' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - - {% endif %} - -{{ macros.install_packages(tacker_server_packages | customizable("packages")) }} - -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_tacker_extend_start RUN chmod 755 /usr/local/bin/kolla_tacker_extend_start diff --git a/docker/trove/trove-api/Dockerfile.j2 b/docker/trove/trove-api/Dockerfile.j2 index c6a8aed73..5109479e6 100644 --- a/docker/trove/trove-api/Dockerfile.j2 +++ b/docker/trove/trove-api/Dockerfile.j2 @@ -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 trove_api_packages = ['openstack-trove-api'] %} - {% elif base_package_type == 'deb' %} - {% set trove_api_packages = ['trove-api'] %} - {% endif %} - -{{ macros.install_packages(trove_api_packages | customizable("packages")) }} - -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_trove_extend_start RUN chmod 755 /usr/local/bin/kolla_trove_extend_start diff --git a/docker/trove/trove-base/Dockerfile.j2 b/docker/trove/trove-base/Dockerfile.j2 index cce401354..5dadfe53f 100644 --- a/docker/trove/trove-base/Dockerfile.j2 +++ b/docker/trove/trove-base/Dockerfile.j2 @@ -9,18 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='trove') }} -{% if install_type == 'binary' %} - - {% if base_package_type == 'rpm' %} - {% set trove_base_packages = ['openstack-trove-common'] %} - {% elif base_package_type == 'deb' %} - {% set trove_base_packages = ['trove-common'] %} - {% endif %} - -{{ macros.install_packages(trove_base_packages | customizable("packages")) }} - -{% elif install_type == 'source' %} - ADD trove-base-archive /trove-base-source {% set trove_base_pip_packages = [ @@ -33,8 +21,6 @@ RUN ln -s trove-base-source/* trove \ && cp -r /trove/etc/trove/* /etc/trove/ \ && chown -R trove: /etc/trove -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN touch /usr/local/bin/kolla_trove_extend_start \ diff --git a/docker/trove/trove-conductor/Dockerfile.j2 b/docker/trove/trove-conductor/Dockerfile.j2 index 3eaf0ade7..bf187da81 100644 --- a/docker/trove/trove-conductor/Dockerfile.j2 +++ b/docker/trove/trove-conductor/Dockerfile.j2 @@ -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 trove_conductor_packages = ['openstack-trove-conductor'] %} - {% elif base_package_type == 'deb' %} - {% set trove_conductor_packages = ['trove-conductor'] %} - {% endif %} - -{{ macros.install_packages(trove_conductor_packages | customizable("packages")) }} - -{% endif %} - {% block trove_conductor_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/trove/trove-guestagent/Dockerfile.j2 b/docker/trove/trove-guestagent/Dockerfile.j2 index 6f4082641..bee8eb7b6 100644 --- a/docker/trove/trove-guestagent/Dockerfile.j2 +++ b/docker/trove/trove-guestagent/Dockerfile.j2 @@ -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 trove_guestagent_packages = ['openstack-trove-guestagent'] %} - {% elif base_package_type == 'deb' %} - {% set trove_guestagent_packages = ['trove-guestagent'] %} - {% endif %} - -{{ macros.install_packages(trove_guestagent_packages | customizable("packages")) }} - -{% endif %} - {% block trove_guestagent_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/trove/trove-taskmanager/Dockerfile.j2 b/docker/trove/trove-taskmanager/Dockerfile.j2 index 23ae8c104..b5722e26c 100644 --- a/docker/trove/trove-taskmanager/Dockerfile.j2 +++ b/docker/trove/trove-taskmanager/Dockerfile.j2 @@ -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 trove_taskmanager_packages = ['openstack-trove-taskmanager'] %} - {% elif base_package_type == 'deb' %} - {% set trove_taskmanager_packages = ['trove-taskmanager'] %} - {% endif %} - -{{ macros.install_packages(trove_taskmanager_packages | customizable("packages")) }} - -{% endif %} - {% block trove_taskmanager_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/vitrage/vitrage-api/Dockerfile.j2 b/docker/vitrage/vitrage-api/Dockerfile.j2 index e579f05fa..b50e1a613 100644 --- a/docker/vitrage/vitrage-api/Dockerfile.j2 +++ b/docker/vitrage/vitrage-api/Dockerfile.j2 @@ -7,38 +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 vitrage_api_packages = [ - 'openstack-vitrage-api', - ] %} - -{{ macros.install_packages(vitrage_api_packages | customizable("packages")) }} - - {% elif base_package_type == 'deb' %} - {% if base_distro == 'debian' %} - - {% set vitrage_api_packages = [ - 'vitrage-api' - ] %} - -{{ macros.install_packages(vitrage_api_packages | customizable("packages")) }} -RUN mkdir -p /var/www/cgi-bin/vitrage \ - && cp -a /usr/lib/python3/dist-packages/vitrage/api/app.wsgi /var/www/cgi-bin/vitrage/ - - {% else %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - - {% endif %} - {% endif %} - -{% endif %} - - COPY extend_start.sh /usr/local/bin/kolla_vitrage_extend_start RUN chmod 755 /usr/local/bin/kolla_vitrage_extend_start diff --git a/docker/vitrage/vitrage-base/Dockerfile.j2 b/docker/vitrage/vitrage-base/Dockerfile.j2 index 89b3d04d0..79fa8f770 100644 --- a/docker/vitrage/vitrage-base/Dockerfile.j2 +++ b/docker/vitrage/vitrage-base/Dockerfile.j2 @@ -10,53 +10,18 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.enable_extra_repos(['powertools']) }} {{ macros.configure_user(name='vitrage') }} -{% if install_type == 'binary' %} - - {% if base_package_type == 'rpm' %} - - {% set vitrage_base_packages = [ - 'openstack-vitrage-common' - ] %} - -{{ macros.install_packages(vitrage_base_packages | customizable("packages")) }} \ - && mkdir -p /var/www/cgi-bin/vitrage \ - && cp -a /usr/lib/python{{ distro_python_version }}/site-packages/vitrage/api/app.wsgi /var/www/cgi-bin/vitrage/ \ - && chown -R vitrage: /var/www/cgi-bin/vitrage - - {% elif base_package_type == 'deb' %} - {% if base_distro == 'debian' %} +{% if base_package_type == 'rpm' %} {% set vitrage_base_packages = [ - 'python3-vitrage', - 'vitrage-common' ] %} -{{ macros.install_packages(vitrage_base_packages | customizable("packages")) }} - - {% else %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - - {% endif %} - {% endif %} - -{% elif install_type == 'source' %} - - {% if base_package_type == 'rpm' %} +{% elif base_package_type == 'deb' %} - {% set vitrage_base_packages = [ - ] %} - -{{ macros.install_packages(vitrage_base_packages | customizable("packages")) }} - - {% elif base_package_type == 'deb' %} - - {% set vitrage_base_packages = [ - ] %} + {% set vitrage_base_packages = [ + ] %} -{{ macros.install_packages(vitrage_base_packages | customizable("packages")) }} {% endif %} +{{ macros.install_packages(vitrage_base_packages | customizable("packages")) }} {% set vitrage_base_pip_packages = [ '/vitrage' @@ -70,8 +35,6 @@ RUN ln -s vitrage-base-source/* vitrage \ && cp /vitrage/vitrage/api/app.wsgi /var/www/cgi-bin/vitrage \ && chown -R vitrage: /etc/vitrage /var/www/cgi-bin/vitrage -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN touch /usr/local/bin/kolla_vitrage_extend_start \ && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_vitrage_extend_start diff --git a/docker/vitrage/vitrage-graph/Dockerfile.j2 b/docker/vitrage/vitrage-graph/Dockerfile.j2 index bf2d13982..aea406f94 100644 --- a/docker/vitrage/vitrage-graph/Dockerfile.j2 +++ b/docker/vitrage/vitrage-graph/Dockerfile.j2 @@ -7,35 +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 vitrage_graph_packages = [ - 'openstack-vitrage-graph' - ] %} - -{{ macros.install_packages(vitrage_graph_packages | customizable("packages")) }} - - {% elif base_package_type == 'deb' %} - {% if base_distro == 'debian' %} - - {% set vitrage_graph_packages = [ - 'vitrage-graph' - ] %} - -{{ macros.install_packages(vitrage_graph_packages | customizable("packages")) }} - - {% else %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - - {% endif %} - {% endif %} - -{% endif %} - {% block vitrage_graph_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/vitrage/vitrage-ml/Dockerfile.j2 b/docker/vitrage/vitrage-ml/Dockerfile.j2 index 52a4caeb2..aea3ec678 100644 --- a/docker/vitrage/vitrage-ml/Dockerfile.j2 +++ b/docker/vitrage/vitrage-ml/Dockerfile.j2 @@ -7,35 +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 vitrage_ml_packages = [ - 'openstack-vitrage-ml' - ] %} - -{{ macros.install_packages(vitrage_ml_packages | customizable("packages")) }} - - {% elif base_package_type == 'deb' %} - {% if base_distro == 'debian' %} - - {% set vitrage_ml_packages = [ - 'vitrage-ml' - ] %} - -{{ macros.install_packages(vitrage_ml_packages | customizable("packages")) }} - - {% else %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - - {% endif %} - {% endif %} - -{% endif %} - {% block vitrage_ml_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/vitrage/vitrage-notifier/Dockerfile.j2 b/docker/vitrage/vitrage-notifier/Dockerfile.j2 index 5f9649c40..2af6f39d8 100644 --- a/docker/vitrage/vitrage-notifier/Dockerfile.j2 +++ b/docker/vitrage/vitrage-notifier/Dockerfile.j2 @@ -7,35 +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 vitrage_notifier_packages = [ - 'openstack-vitrage-notifier' - ] %} - -{{ macros.install_packages(vitrage_notifier_packages | customizable("packages")) }} - - {% elif base_package_type == 'deb' %} - {% if base_distro == 'debian' %} - - {% set vitrage_notifier_packages = [ - 'vitrage-notifier' - ] %} - -{{ macros.install_packages(vitrage_notifier_packages | customizable("packages")) }} - - {% else %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - - {% endif %} - {% endif %} - -{% endif %} - {% block vitrage_notifier_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/vitrage/vitrage-persistor/Dockerfile.j2 b/docker/vitrage/vitrage-persistor/Dockerfile.j2 index f07d930f3..16bdbe0b8 100644 --- a/docker/vitrage/vitrage-persistor/Dockerfile.j2 +++ b/docker/vitrage/vitrage-persistor/Dockerfile.j2 @@ -7,35 +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 vitrage_persistor_packages = [ - 'openstack-vitrage-persistor' - ] %} - -{{ macros.install_packages(vitrage_persistor_packages | customizable("packages")) }} - - {% elif base_package_type == 'deb' %} - {% if base_distro == 'debian' %} - - {% set vitrage_persistor_packages = [ - 'vitrage-persistor' - ] %} - -{{ macros.install_packages(vitrage_persistor_packages | customizable("packages")) }} - - {% else %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - - {% endif %} - {% endif %} - -{% endif %} - {% block vitrage_persistor_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/zun/zun-api/Dockerfile.j2 b/docker/zun/zun-api/Dockerfile.j2 index 75b278a2b..e43a1b87f 100644 --- a/docker/zun/zun-api/Dockerfile.j2 +++ b/docker/zun/zun-api/Dockerfile.j2 @@ -5,13 +5,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block zun_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_zun_extend_start RUN chmod 755 /usr/local/bin/kolla_zun_extend_start diff --git a/docker/zun/zun-base/Dockerfile.j2 b/docker/zun/zun-base/Dockerfile.j2 index 67551c470..9e1c4f07c 100644 --- a/docker/zun/zun-base/Dockerfile.j2 +++ b/docker/zun/zun-base/Dockerfile.j2 @@ -10,31 +10,24 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.enable_extra_repos(['openvswitch']) }} {{ macros.configure_user(name='zun') }} -{% if install_type == 'binary' %} +{% if base_package_type == 'rpm' %} -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% elif install_type == 'source' %} - - {% if base_package_type == 'rpm' %} - - {% set zun_base_packages = [ - 'numactl', - ] %} + {% set zun_base_packages = [ + 'numactl', + ] %} {{ macros.install_packages(zun_base_packages | customizable("packages")) }} RUN mkdir -p /var/www/cgi-bin/zun - {% elif base_package_type == 'deb' %} +{% elif base_package_type == 'deb' %} - {% set zun_base_packages = [ - 'numactl', - ] %} + {% set zun_base_packages = [ + 'numactl', + ] %} {{ macros.install_packages(zun_base_packages | customizable("packages")) }} RUN mkdir -p /var/www/cgi-bin/zun - {% endif %} +{% endif %} ADD zun-base-archive /zun-base-source @@ -50,8 +43,6 @@ RUN ln -s zun-base-source/* zun \ && chown -R zun: /etc/zun /var/www/cgi-bin/zun \ && 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/zun/rootwrap.conf -{% endif %} - COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers COPY extend_start.sh /usr/local/bin/kolla_extend_start diff --git a/docker/zun/zun-cni-daemon/Dockerfile.j2 b/docker/zun/zun-cni-daemon/Dockerfile.j2 index 296996136..fee32b2fb 100644 --- a/docker/zun/zun-cni-daemon/Dockerfile.j2 +++ b/docker/zun/zun-cni-daemon/Dockerfile.j2 @@ -7,29 +7,21 @@ 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 echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false + {% set zun_cni_daemon_packages = [ + 'openvswitch' + ] %} -{% elif install_type == 'source' %} - {% if base_package_type == 'rpm' %} +{% elif base_package_type == 'deb' %} - {% set zun_cni_daemon_packages = [ - 'openvswitch' - ] %} - - {% elif base_package_type == 'deb' %} - - {% set zun_cni_daemon_packages = [ - 'bridge-utils', - 'openvswitch-switch' - ] %} - - {% endif %} -{{ macros.install_packages(zun_cni_daemon_packages | customizable("packages")) }} + {% set zun_cni_daemon_packages = [ + 'bridge-utils', + 'openvswitch-switch' + ] %} {% endif %} +{{ macros.install_packages(zun_cni_daemon_packages | customizable("packages")) }} COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers diff --git a/docker/zun/zun-compute/Dockerfile.j2 b/docker/zun/zun-compute/Dockerfile.j2 index cf67fb203..ea6fa6d61 100644 --- a/docker/zun/zun-compute/Dockerfile.j2 +++ b/docker/zun/zun-compute/Dockerfile.j2 @@ -9,13 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.enable_extra_repos(['ceph']) }} -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% endif %} - {% set zun_compute_packages = [ 'ceph-common', 'e2fsprogs', diff --git a/docker/zun/zun-wsproxy/Dockerfile.j2 b/docker/zun/zun-wsproxy/Dockerfile.j2 index 3663262f7..5e76b755f 100644 --- a/docker/zun/zun-wsproxy/Dockerfile.j2 +++ b/docker/zun/zun-wsproxy/Dockerfile.j2 @@ -5,13 +5,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block zun_wsproxy_header %}{% endblock %} -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% endif %} - {% block zun_wsproxy_footer %}{% endblock %} {% block footer %}{% endblock %} |