Skip to content
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

Jump to bottom

[docker-syncd]: Fix mount point for machine.conf #991

Closed
wants to merge 1 commit into from
Closed

[docker-syncd]: Fix mount point for machine.conf #991

wants to merge 1 commit into from

Conversation

marian-pritsak
Copy link
Collaborator

machine.conf must be mounted under /host directory in each container so
that config engine can find and parse it

Signed-off-by: marian-pritsak marianp@mellanox.com

@marian-pritsak
[docker-syncd]: Fix mount point for machine.conf
54d6590 
machine.conf must be mounted under /host directory in each container so
that config engine can find and parse it

Signed-off-by: marian-pritsak <marianp@mellanox.com>
@marian-pritsak marian-pritsak self-assigned this Sep 27, 2017
@jleveque
Copy link
Contributor

@marian-pritsak: Where is sonic-cfggen being called in the syncd dockers that reference machine.conf?

@marian-pritsak
Copy link
Collaborator Author

It's not called, but machine.conf is only mounted for that reason. So we can either fix it or remove it at all.

@jleveque
Copy link
Contributor

jleveque commented Sep 29, 2017 •
edited
Loading

It's only mounted in the syncd dockers, but not in any others. Maybe we should just remove the lines altogether. However, if removed, does this cause different behavior between sonic-cfggen in dockers vs. sonic-cfggen in the base image? If so, I think we should ensure sonic-cfggen behaves the same in both dockers and the base image.

@taoyl-ms: Should we remove these mounts from the syncd dockers, or keep this commit and add them to all dockers?

@marian-pritsak
Copy link
Collaborator Author

It's also mounted and used in swss container

https://github.com/Azure/sonic-buildimage/blob/master/platform/mellanox/docker-orchagent-mlnx.mk#L14

But there destination path is correct

@lguohan
Copy link
Collaborator

lguohan commented Sep 30, 2017

I do not know about other platforms, but brcm sai is relying on /etc/machine.conf, we need to keep /etc/machine.conf at least for broadcom syncd docker.

are we using sonic-cfggen in syncd docker, it looks like we do not. if we want to ensure the same behavior for sonic-cfggen, then we need to add /host/machine.conf:/host/machine.conf and still keep /host/machine.conf:/etc/machine.conf

lguohan
lguohan requested changes Sep 30, 2017
View reviewed changes
Copy link
Collaborator

@lguohan lguohan left a comment

Choose a reason for hiding this comment

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

need to keep /host/machine.conf:/etc/machine.conf for brcm platform.

For other platform, we need to confirmation from others.

lguohan
lguohan reviewed Sep 30, 2017
View reviewed changes
platform/mellanox/docker-syncd-mlnx-rpc.mk
@@ -11,5 +11,5 @@ endif

$(DOCKER_SYNCD_MLNX_RPC)_CONTAINER_NAME = syncd
$(DOCKER_SYNCD_MLNX_RPC)_RUN_OPT += --net=host --privileged -t
$(DOCKER_SYNCD_MLNX_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
$(DOCKER_SYNCD_MLNX_RPC)_RUN_OPT += -v /host/machine.conf:/host/machine.conf
Copy link
Collaborator

Choose a reason for hiding this comment

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

@marian-pritsak , if you are sure you do not use /etc/machine.conf on your platform, you can remove it.

@marian-pritsak marian-pritsak deleted the machine branch October 10, 2017 13:54
zhenggen-xu added a commit to zhenggen-xu/sonic-buildimage that referenced this pull request Aug 2, 2019
@zhenggen-xu
Update sonic-swss submodule
aa0b243 
* src/sonic-swss 63afbd5...5be3963 (11):
  > Remove the platform check for remove/add port action at init phase. (sonic-net#1006)
  > [test]: Add Class object in each test script file (sonic-net#992)
  > [vstest]: add --imgname option to specify vs image to test (sonic-net#996)
  > [qosorch]: Add cir and pir parameters for scheduler (sonic-net#991)
  > [vstest]: report error when team kernel module is not available (sonic-net#994)
  > Support per buffer pool watermark polling mode (sonic-net#973)
  > [test]: Update test_vlan to use dvs functions (sonic-net#986)
  > Add synchronous switch to orch agent (sonic-net#987)
  > ARM32 bit fixes, for 64bit printf format specifier (sonic-net#989)
  > [portsorch]: Rename function isPortReady() to allPortsReady() (sonic-net#990)
  > [routeorch]: Fix observer detaching procedure for next hop observers (sonic-net#985)

Signed-off-by: Zhenggen Xu <zxu@linkedin.com>
lguohan pushed a commit that referenced this pull request Aug 7, 2019
@zhenggen-xu @lguohan
[Feature: DynamicPortBreakout] Use consolidated bcm file for Seastone…
6f40933 
… platform (#3240)

* Utilize the same sai.profile and config.bcm file

Signed-off-by: Zhenggen Xu <zxu@linkedin.com>

* Fix the index issues for HWSKU: Seastone-DX010-25-50 and Seastone-DX010-50-40

Signed-off-by: Zhenggen Xu <zxu@linkedin.com>

* Update sonic-swss submodule

* src/sonic-swss 63afbd5...5be3963 (11):
  > Remove the platform check for remove/add port action at init phase. (#1006)
  > [test]: Add Class object in each test script file (#992)
  > [vstest]: add --imgname option to specify vs image to test (#996)
  > [qosorch]: Add cir and pir parameters for scheduler (#991)
  > [vstest]: report error when team kernel module is not available (#994)
  > Support per buffer pool watermark polling mode (#973)
  > [test]: Update test_vlan to use dvs functions (#986)
  > Add synchronous switch to orch agent (#987)
  > ARM32 bit fixes, for 64bit printf format specifier (#989)
  > [portsorch]: Rename function isPortReady() to allPortsReady() (#990)
  > [routeorch]: Fix observer detaching procedure for next hop observers (#985)

Signed-off-by: Zhenggen Xu <zxu@linkedin.com>
madhanmellanox pushed a commit to madhanmellanox/sonic-buildimage that referenced this pull request Mar 23, 2020
@tengfei-astfs @stcheng
[qosorch]: Add cir and pir parameters for scheduler (sonic-net#991)
cadc5bd 
Signed-off-by: tengfei <tengfei@asterfusion.com>
abdosi added a commit to abdosi/sonic-buildimage that referenced this pull request May 14, 2020
@abdosi
[Submodule update] sonic-utilities
4a74166 
Fix is_mgmt_vrf_enabled when MGMT_VRF_CONFIG is not present the config (sonic-net#885)
Changes to support acl-loader command for multi-npu platforms. (sonic-net#908)
Stop/Start restapi server upon config reload (sonic-net#911)
[fanshow] Add column drawer name and led status to output of show
platform(sonic-net#991)
[MultiDB] use sonic-db-cli instead of redis-cli in new added codes
(sonic-net#907)
[show] Add `ntpstat` output to `show ntp` (sonic-net#861)
[config] Log invocation of config commands to syslog (sonic-net#259)
Remove dependency on click-default-group package (sonic-net#903)
[config] Add 'interface transceiver' subgroup with 'lpmode' and 'rese…'
(sonic-net#904)
[show] Add 'errors' and 'rates' subcommands to 'show interfaces
count…(sonic-net#900)
[config] Support load_minigraph command for multi NPU platform (sonic-net#896)
[Vnet] Fix NameError for 'swsssdk' and align output (sonic-net#902)
@abdosi abdosi mentioned this pull request May 15, 2020
Merged
abdosi added a commit that referenced this pull request May 18, 2020
@abdosi
[Submodule update] sonic-utilities (#4601)
cb5221a 
Fix is_mgmt_vrf_enabled when MGMT_VRF_CONFIG is not present the config (#885)
Changes to support acl-loader command for multi-npu platforms. (#908)
Stop/Start restapi server upon config reload (#911)
[fanshow] Add column drawer name and led status to output of show
platform(#991)
[MultiDB] use sonic-db-cli instead of redis-cli in new added codes
(#907)
[show] Add `ntpstat` output to `show ntp` (#861)
[config] Log invocation of config commands to syslog (#259)
Remove dependency on click-default-group package (#903)
[config] Add 'interface transceiver' subgroup with 'lpmode' and 'rese…'
(#904)
[show] Add 'errors' and 'rates' subcommands to 'show interfaces
count…(#900)
[config] Support load_minigraph command for multi NPU platform (#896)
[Vnet] Fix NameError for 'swsssdk' and align output (#902)
@jleveque jleveque mentioned this pull request Jul 19, 2020
Merged
jleveque added a commit that referenced this pull request Jul 20, 2020
@jleveque
[sonic-utilities] Update submodule (#5004)
6ef199f 
* src/sonic-utilities a23479e...82dfe50 (3):
  > [sonic-installer] Update group name for 'verify-next-image' subcommand (#/995)
  > [acl_loader] Fix bugs in acl_loader (#991)
  > [show] Add support for QSFP-DD cables on 'show' command (#989)

This submodule update resolves sonic-net/sonic-utilities#997 by including PR sonic-net/sonic-utilities#995
stepanblyschak pushed a commit to stepanblyschak/sonic-buildimage that referenced this pull request May 10, 2021
@daall
[acl_loader] Fix bugs in acl_loader (sonic-net#991)
e3d6ba0 
- Support protocol number == 0
- Emit warning if --table_name not found in Config DB

Signed-off-by: Danny Allen <daall@microsoft.com>
@dprital dprital mentioned this pull request Jan 23, 2022
Merged
5 tasks
liat-grozovik pushed a commit that referenced this pull request Jan 24, 2022
@dprital
[202012] [submodule] Update sonic-sairedis (#9833)
3bd032c 
Update submodule sonic-sairedis that contains the following commit:

Change the log severity leve from ERROR to NOTICE if getStatus is not supported by vendor (#908) (#991)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lguohan lguohan lguohan requested changes

@jleveque jleveque Awaiting requested review from jleveque

@oleksandrivantsiv oleksandrivantsiv Awaiting requested review from oleksandrivantsiv

Assignees
No one assigned
Labels
Bug 🐛
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@marian-pritsak @jleveque @lguohan