matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[chassis]: Use correct path for chassisdb.conf file (#5632)

Browse Source 
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 <hxu@arista.com>
This commit is contained in:
BrynXu 2020-10-21 01:40:04 -07:00 committed by GitHub
parent ca7a4a4e3a
commit 29928c93a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dockers/docker-database/docker-database-init.sh
View File

@ -39,7 +39,7 @@ fi
start_chassis_db=0 start_chassis_db=0
chassis_db_address="" chassis_db_address=""
chassis_db_port="" chassis_db_port=""
chassisdb_config="/etc/sonic/chassisdb.conf" chassisdb_config="/usr/share/sonic/platform/chassisdb.conf"
[ -f $chassisdb_config ] && source $chassisdb_config [ -f $chassisdb_config ] && source $chassisdb_config
db_cfg_file="/var/run/redis/sonic-db/database_config.json" db_cfg_file="/var/run/redis/sonic-db/database_config.json"

2
files/build_templates/docker_image_ctl.j2
View File

@ -253,7 +253,7 @@ start() {
{%- if docker_container_name == "database" %} {%- if docker_container_name == "database" %}
start_chassis_db=0 start_chassis_db=0
chassis_db_address="" chassis_db_address=""
chassisdb_config="/etc/sonic/chassisdb.conf" chassisdb_config="/usr/share/sonic/device/$PLATFORM/chassisdb.conf"
[ -f $chassisdb_config ] && source $chassisdb_config [ -f $chassisdb_config ] && source $chassisdb_config
DB_OPT=" -v /var/run/redis-chassis:/var/run/redis-chassis:ro " DB_OPT=" -v /var/run/redis-chassis:/var/run/redis-chassis:ro "
if [[ "$start_chassis_db" != "1" ]] && [[ -z "$chassis_db_address" ]]; then if [[ "$start_chassis_db" != "1" ]] && [[ -z "$chassis_db_address" ]]; then