Merge "Remove skydive rpm installation"
This commit is contained in:
commit
ce0fe598aa
|
@ -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 %}
|
||||
|
|
|
@ -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 %}
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue