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

Add override_config to load_minigraph in config-setup service (#14834) (#15097)

Browse Source 
This PR is to handle the override minigraph config by golden_config_db.json file if it is present in the backup location.
This commit is contained in:
judyjoseph 2023-05-17 13:17:20 -07:00 committed by GitHub
parent 5206fcd097
commit b6df524b0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
files/Aboot/boot0.j2
View File

@ -118,7 +118,8 @@ clean_flash() {
[ $f != "minigraph.xml" ] &&
[ $f != "snmp.yml" ] &&
[ $f != "acl.json" ] &&
[ $f != "port_config.json" ]
[ $f != "port_config.json" ] &&
[ $f != "golden_config_db.json" ]
then
rm -rf "$target_path/$f"
fi

8
files/image_config/config-setup/config-setup
View File

@ -109,7 +109,11 @@ run_hookdir() {
reload_minigraph()
{
echo "Reloading minigraph..."
config load_minigraph -y -n
if [ -f /etc/sonic/golden_config_db.json ]; then
config load_minigraph -y -n --override_config --golden_config_path '/etc/sonic/golden_config_db.json'
else
config load_minigraph -y -n
fi
config save -y
}
@ -305,7 +309,7 @@ check_all_config_db_present()
do_config_migration()
{
# Identify list of files to migrate
copy_list="minigraph.xml snmp.yml acl.json port_config.json frr telemetry"
copy_list="minigraph.xml snmp.yml acl.json port_config.json frr telemetry golden_config_db.json"
# Migrate all configuration files from old to new
copy_config_files_and_directories $copy_list

6
files/image_config/platform/rc.local
View File

@ -126,6 +126,8 @@ migrate_nos_configuration()
PORT_CONFIG_GZFILE=$NOS_DIR/port_config.json.gz.base64.txt
PORT_CONFIG_FILE=$NOS_DIR/port_config.json
SNMP_FILE=$NOS_DIR/snmp.yml
GOLDEN_CONFIG_DB_GZFILE=$NOS_DIR/golden_config_db.json.gz.base64.txt
GOLDEN_CONFIG_DB_FILE=$NOS_DIR/golden_config_db.json
mkdir -p $NOS_DIR
mount $nos_dev $NOS_DIR
@ -137,6 +139,7 @@ migrate_nos_configuration()
[ -f $MG_GZFILE ] && /usr/bin/base64 -d $MG_GZFILE | /bin/gunzip > $MG_FILE
[ -f $ACL_GZFILE ] && /usr/bin/base64 -d $ACL_GZFILE | /bin/gunzip > $ACL_FILE
[ -f $PORT_CONFIG_GZFILE ] && /usr/bin/base64 -d $PORT_CONFIG_GZFILE | /bin/gunzip > $PORT_CONFIG_FILE
[ -f $GOLDEN_CONFIG_DB_GZFILE] && /usr/bin/base64 -d $GOLDEN_CONFIG_DB_GZFILE| /bin/gunzip > $GOLDEN_CONFIG_DB_FILE
# Copy relevant files
nos_migration_import $NOS_DIR/mgmt_interface.cfg /host/migration
@ -144,6 +147,7 @@ migrate_nos_configuration()
nos_migration_import $ACL_FILE /host/migration
nos_migration_import $PORT_CONFIG_FILE /host/migration
nos_migration_import $SNMP_FILE /host/migration
nos_migration_import $GOLDEN_CONFIG_DB_FILE /host/migration
if [ "$sonic_fast_reboot" == true ]; then
mkdir -p /host/fast-reboot
@ -261,6 +265,7 @@ if [ -f $FIRST_BOOT_FILE ]; then
[ -f /host/acl.json ] && mv /host/acl.json /etc/sonic/old_config/
[ -f /host/port_config.json ] && mv /host/port_config.json /etc/sonic/old_config/
[ -f /host/snmp.yml ] && mv /host/snmp.yml /etc/sonic/old_config/
[ -f /host/golden_config_db.json ] && mv /host/golden_config_db.json /etc/sonic/old_config/
touch /tmp/pending_config_migration
elif [ -n "$migration" ] && [ -f /host/migration/minigraph.xml ]; then
mkdir -p /etc/sonic/old_config
@ -268,6 +273,7 @@ if [ -f $FIRST_BOOT_FILE ]; then
[ -f /host/migration/acl.json ] && mv /host/migration/acl.json /etc/sonic/old_config/
[ -f /host/migration/port_config.json ] && mv /host/migration/port_config.json /etc/sonic/old_config/
[ -f /host/migration/snmp.yml ] && mv /host/migration/snmp.yml /etc/sonic/old_config/
[ -f /host/migration/golden_config_db.json ] && mv /host/migration/golden_config_db.json /etc/sonic/old_config/
touch /tmp/pending_config_migration
[ -f /etc/sonic/updategraph.conf ] && sed -i -e "s/enabled=false/enabled=true/g" /etc/sonic/updategraph.conf
else

1
files/image_config/secureboot/allowlist_paths.conf
View File

@ -36,3 +36,4 @@ etc/subuid
etc/tacplus_nss.conf
etc/tacplus_user
lib/systemd/system/serial-getty@.service
etc/sonic/golden_config_db.json