openstack
/
kolla
Code Issues Proposed changes

Remove skydive rpm installation 

Since some time (around v0.22.0) skydive team has stopped publishing
rpm packages in centos-opstools repo - instead they moved into
producing docker images for consumption.

This change removes usage of rpms for rpm distros and uses GitHub release
binary as in deb distros.

Change-Id: Ie586b0f249e545877ab1dd156d08e1863cd479ba
This commit is contained in:
Michal Nasiadka 2019-11-29 15:38:18 +01:00
parent 0bc6348ea5
commit d1038e03f0
3 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/skydive/skydive-agent/Dockerfile.j2
View File

@ -6,15 +6,19 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% block skydive_agent_install %}
{% if base_package_type == 'rpm' %}
{% set skydive_agent_packages = [
'openvswitch',
'skydive-agent'
] %}
{% set skydive_agent_packages = ['openvswitch'] %}
{% elif base_package_type == 'deb' %}
{% set skydive_agent_packages = ['openvswitch-common'] %}
{% endif %}
{{ macros.install_packages(skydive_agent_packages | customizable("packages")) }}
{% endblock %}
{% block skydive_agent_footer %}{% endblock %}

7
docker/skydive/skydive-analyzer/Dockerfile.j2
View File

@ -5,12 +5,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% block skydive_analyzer_install %}
{% if base_package_type == 'rpm' %}
{% set skydive_analyzer_packages = ['skydive-analyzer'] %}
{{ macros.install_packages(skydive_analyzer_packages | customizable("packages")) }}
{% endif %}
{% endblock %}
{% block skydive_analyzer_install %}{% endblock %}
{% block skydive_analyzer_footer %}{% endblock %}

11
docker/skydive/skydive-base/Dockerfile.j2
View File

@ -8,18 +8,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='skydive') }}
{% block skydive_install %}
{% if base_package_type == 'rpm' %}
{% set skydive_base_packages = ['skydive'] %}
{{ macros.install_packages(skydive_base_packages | customizable("packages")) }}
{% else %}
{% if base_arch != 'x86_64' %}
{% if base_arch != 'x86_64' %}
RUN echo '{{ install_type }} on {{ base_distro }} not yet available on non x86_64 platforms' \
&& /bin/false
{% else %}
{% else %}
RUN curl -o /usr/bin/skydive -L "https://github.com/skydive-project/skydive/releases/download/v0.26.0/skydive" \
&& chmod +x /usr/bin/skydive
{% endif %}
{% endif %}
{% endblock %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start