17727e1481
Currently we are enabling repos irrespective of rpm/deb statement blocks and not failing in the method used if a repository is missing. Downside is - we might be producing one more layer, but it probably is a more logical approach. This is required for adding rpm support in repos.yaml that will also include failing on missing repositories. Change-Id: I5479c5c935760f00fe4cd307366f261deee3199f Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
46 lines
1.4 KiB
Django/Jinja
46 lines
1.4 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
|
{% block labels %}
|
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
|
{% endblock %}
|
|
|
|
{% block openvswitch_base_header %}{% endblock %}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{% block ovs_install %}
|
|
|
|
{% if base_package_type == 'rpm' %}
|
|
|
|
{{ macros.enable_extra_repos(['openvswitch']) }}
|
|
|
|
{% set openvswitch_base_packages = [
|
|
'libibverbs',
|
|
'openvswitch${KOLLA_RPM_OVS_VERSION}',
|
|
'python3-openvswitch${KOLLA_RPM_OVS_VERSION}',
|
|
'tcpdump'
|
|
] %}
|
|
{% elif base_package_type == 'deb' %}
|
|
{% set openvswitch_base_packages = [
|
|
'openvswitch-switch',
|
|
'python3-openvswitch',
|
|
'tcpdump'
|
|
] %}
|
|
{% endif %}
|
|
|
|
{{ macros.install_packages(openvswitch_base_packages | customizable("packages")) }}
|
|
|
|
{% endblock %}
|
|
|
|
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
|
COPY ovs_wrapper.sh /usr/local/bin/ovs_wrapper
|
|
|
|
# NOTE(hrw): Upstream moved tcpdump to /usr/bin/ in 4.99 version (used in Debian)
|
|
RUN if [ -e /usr/sbin/tcpdump ]; then mv /usr/sbin/tcpdump /usr/bin/tcpdump; fi \
|
|
&& touch /usr/local/bin/kolla_openvswitch_extend_start \
|
|
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_openvswitch_extend_start \
|
|
&& chmod 755 /usr/local/bin/ovs_wrapper
|
|
|
|
{{ macros.kolla_patch_sources() }}
|
|
|
|
{% block openvswitch_base_footer %}{% endblock %}
|