Disable multi-db and ring buffer

Author: liuh-80

dockers/docker-orchagent/orchagent.sh

@@ -115,9 +115,9 @@ if [[ x"${MGMT_VRF_ENABLED}" == x"true" ]]; then
 fi
 
 # Enable ring buffer
-ORCHDAEMON_RING_ENABLED=`sonic-db-cli CONFIG_DB hget "DEVICE_METADATA|localhost" "ring_thread_enabled"`
-if [[ x"${ORCHDAEMON_RING_ENABLED}" == x"true" ]]; then
-    ORCHAGENT_ARGS+=" -R"
-fi
+#ORCHDAEMON_RING_ENABLED=`sonic-db-cli CONFIG_DB hget "DEVICE_METADATA|localhost" "ring_thread_enabled"`
+#if [[ x"${ORCHDAEMON_RING_ENABLED}" == x"true" ]]; then
+#    ORCHAGENT_ARGS+=" -R"
+#fi
 
 exec /usr/bin/orchagent ${ORCHAGENT_ARGS}

files/build_templates/sonic_debian_extension.j2

@@ -1201,4 +1201,6 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-mark unho
 {% endif %}
 
 ## Enable MULTIDB
+{% if ENABLE_MULTIDB == "y" %}
 sudo touch $FILESYSTEM_ROOT_ETC_SONIC/enable_multidb
+{% endif %}