Skip to content

[Mellanox][Smartswitch]Changes for mounting dbus socket #20816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qiluo-msft merged 4 commits into from
Jan 18, 2025
Merged

[Mellanox][Smartswitch]Changes for mounting dbus socket #20816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
82e69a8
Changes for mounting dbus socket
gpunathilell Oct 29, 2024
747318b
Mount is smart switch specific
gpunathilell Dec 3, 2024
6fd3802
Change variable name
gpunathilell Dec 3, 2024
40f3e83
Added empty string
gpunathilell Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions dockers/docker-platform-monitor/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ RUN apt-get update && \
nvme-cli \
ethtool \
xxd
{% if sonic_asic_platform == 'mellanox' %}
RUN apt-get install -y dbus
{% endif %}

# smartmontools version should match the installed smartmontools in sonic_debian_extension build template
RUN apt-get install -y -t bookworm-backports \
Expand Down
8 changes: 8 additions & 0 deletions files/build_templates/docker_image_ctl.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,6 +618,13 @@ start() {

{%- if sonic_asic_platform == "mellanox" %}
# TODO: Mellanox will remove the --tmpfs exception after SDK socket path changed in new SDK version
{%- if docker_container_name == "pmon" %}
if [[ $NUM_DPU -gt 0 ]]; then
SMARTSWITCH_MNT= " -v /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket"
Copy link
Collaborator

@qiluo-msft qiluo-msft Jan 15, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SMARTSWITCH_MNT

If the conditions are not met, please init SMARTSWITCH_MNT to empty string. #Closed

Copy link
Contributor Author

@gpunathilell gpunathilell Jan 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

else
SMARTSWITCH_MNT= ""
fi
{%- endif %}
{%- endif %}
docker create {{docker_image_run_opt}} \
{%- if docker_container_name != "dhcp_server" %}
Expand All @@ -644,6 +651,7 @@ start() {
-v /var/run/hw-management:/var/run/hw-management:rw \
-v mlnx_sdk_socket:/var/run/sx_sdk \
-v /tmp/nv-syncd-shared/:/tmp \
$SMARTSWITCH_MNT \
-v /dev/shm:/dev/shm:rw \
-e SX_API_SOCKET_FILE=/var/run/sx_sdk/sx_api.sock \
-v /dev/shm:/dev/shm:rw \
Expand Down