diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-04-01 13:41:14 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-04-09 17:44:26 +0200 |
| commit | 1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e (patch) | |
| tree | 05427aa46ce6473684cfe2a824798306291546c9 /docker/masakari | |
| parent | cabfd0f3eff38e2c10cdc7cf4e9271d72eeca91a (diff) | |
| download | kolla-1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e.tar.gz kolla-1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e.zip | |
docker: drop binary parts
Big patch drops all mentions of binary images support. Suggestions are
welcome how to split it into parts or handle better.
Change-Id: I5d5a46c6ce7734ceb8b844e17b43e359d7cac6e3
Diffstat (limited to 'docker/masakari')
| -rw-r--r-- | docker/masakari/masakari-api/Dockerfile.j2 | 24 | ||||
| -rw-r--r-- | docker/masakari/masakari-base/Dockerfile.j2 | 36 | ||||
| -rw-r--r-- | docker/masakari/masakari-engine/Dockerfile.j2 | 20 | ||||
| -rw-r--r-- | docker/masakari/masakari-monitors/Dockerfile.j2 | 67 |
4 files changed, 27 insertions, 120 deletions
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 %} |
