From 29928c93a16bbe4ae8c3f66acf21ad304b3f3309 Mon Sep 17 00:00:00 2001 From: BrynXu Date: Wed, 21 Oct 2020 01:40:04 -0700 Subject: [PATCH] [chassis]: Use correct path for chassisdb.conf file (#5632) use correct chassisdb.conf path while bringing up chassis_db service on VoQ modular switch.chassis_db service on VoQ modular switch. resolves #5631 Signed-off-by: Honggang Xu --- dockers/docker-database/docker-database-init.sh | 2 +- files/build_templates/docker_image_ctl.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dockers/docker-database/docker-database-init.sh b/dockers/docker-database/docker-database-init.sh index babb9f7924a0..bc49376a0b53 100755 --- a/dockers/docker-database/docker-database-init.sh +++ b/dockers/docker-database/docker-database-init.sh @@ -39,7 +39,7 @@ fi start_chassis_db=0 chassis_db_address="" chassis_db_port="" -chassisdb_config="/etc/sonic/chassisdb.conf" +chassisdb_config="/usr/share/sonic/platform/chassisdb.conf" [ -f $chassisdb_config ] && source $chassisdb_config db_cfg_file="/var/run/redis/sonic-db/database_config.json" diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2 index 4d3e795c500e..62846354fd08 100644 --- a/files/build_templates/docker_image_ctl.j2 +++ b/files/build_templates/docker_image_ctl.j2 @@ -253,7 +253,7 @@ start() { {%- if docker_container_name == "database" %} start_chassis_db=0 chassis_db_address="" - chassisdb_config="/etc/sonic/chassisdb.conf" + chassisdb_config="/usr/share/sonic/device/$PLATFORM/chassisdb.conf" [ -f $chassisdb_config ] && source $chassisdb_config DB_OPT=" -v /var/run/redis-chassis:/var/run/redis-chassis:ro " if [[ "$start_chassis_db" != "1" ]] && [[ -z "$chassis_db_address" ]]; then