d3c881858c
Co-authored-by: Zhi Yuan (Carl) Zhao <zyzhao@arista.com> Why I did it Arista 7060 platform has a rare and unreproduceable PCIe timeout that could possibly be solved with increasing the switch PCIe timeout value. To do this we'll call a script for this platform to increase the PCIe timeout on boot-up. No issues would be expected from the setpci command. From the PCIe spec: "Software is permitted to change the value in this field at any time. For Requests already pending when the Completion Timeout Value is changed, hardware is permitted to use either the new or the old value for the outstanding Requests, and is permitted to base the start time for each Request either on when this value was changed or on when each request was issued. " How I did it Add "platform-init" support in swss docker similar to how "hwsku-init" is called, only this would be for any device belonging to a platform. Then the script would reside in device data folder. Additionally, add pciutils dependency to docker-orchagent so it can run the setpci commands. How to verify it On bootup of an Arista 7060, can execute: lspci -vv -s 01:00.0 | grep -i "devctl2" In order to check that the timeout has changed.
78 lines
2.5 KiB
Django/Jinja
Executable File
78 lines
2.5 KiB
Django/Jinja
Executable File
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
|
|
FROM docker-config-engine-stretch
|
|
|
|
ARG docker_container_name
|
|
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
|
|
|
|
## Make apt-get non-interactive
|
|
ENV DEBIAN_FRONTEND=noninteractive
|
|
|
|
RUN apt-get update && \
|
|
apt-get install -f -y \
|
|
ifupdown \
|
|
arping \
|
|
libdbus-1-3 \
|
|
libdaemon0 \
|
|
libjansson4 \
|
|
libpython2.7 \
|
|
iproute2 \
|
|
ndisc6 \
|
|
tcpdump \
|
|
libelf1 \
|
|
libmnl0 \
|
|
bridge-utils \
|
|
pciutils \
|
|
conntrack
|
|
|
|
{% if ( CONFIGURED_ARCH == "armhf" or CONFIGURED_ARCH == "arm64" ) %}
|
|
## Fix for gcc/python not found in arm docker
|
|
RUN apt-get install -f -y python2.7 python2.7-dev
|
|
RUN apt-get install -y gcc-6
|
|
{% endif %}
|
|
{% if CONFIGURED_ARCH == "armhf" %}
|
|
RUN ln -s -f /usr/bin/gcc-6 /usr/bin/arm-linux-gnueabihf-gcc
|
|
{% endif %}
|
|
{% if CONFIGURED_ARCH == "arm64" %}
|
|
RUN ln -s -f /usr/bin/gcc-6 /usr/bin/aarch64-linux-gnu-gcc
|
|
{% endif %}
|
|
|
|
RUN pip install \
|
|
scapy==2.4.2 \
|
|
setuptools \
|
|
pyroute2==0.5.3
|
|
RUN pip install \
|
|
netifaces==0.10.7 \
|
|
monotonic==1.5
|
|
|
|
{% if ( CONFIGURED_ARCH == "armhf" or CONFIGURED_ARCH == "arm64" ) %}
|
|
# Remove installed gcc
|
|
RUN apt-get remove -y gcc-6
|
|
{% endif %}
|
|
|
|
{% if docker_orchagent_debs.strip() -%}
|
|
# Copy locally-built Debian package dependencies
|
|
{{ copy_files("debs/", docker_orchagent_debs.split(' '), "/debs/") }}
|
|
|
|
# Install locally-built Debian packages and implicitly install their dependencies
|
|
{{ install_debian_packages(docker_orchagent_debs.split(' ')) }}
|
|
{%- endif %}
|
|
|
|
## Clean up
|
|
RUN apt-get clean -y && \
|
|
apt-get autoclean -y && \
|
|
apt-get autoremove -y && \
|
|
rm -rf /debs
|
|
|
|
COPY ["files/arp_update", "/usr/bin"]
|
|
COPY ["arp_update.conf", "files/arp_update_vars.j2", "/usr/share/sonic/templates/"]
|
|
COPY ["enable_counters.py", "/usr/bin"]
|
|
COPY ["docker-init.sh", "orchagent.sh", "swssconfig.sh", "/usr/bin/"]
|
|
COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
|
|
COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
|
|
COPY ["critical_processes", "/etc/supervisor/"]
|
|
|
|
## Copy all Jinja2 template files into the templates folder
|
|
COPY ["*.j2", "/usr/share/sonic/templates/"]
|
|
|
|
ENTRYPOINT ["/usr/bin/docker-init.sh"]
|