From c20363c1725e25e9a33bb58434f69872bf09da63 Mon Sep 17 00:00:00 2001
From: dzhang <d.zhang@alibaba-inc.com>
Date: Thu, 19 Sep 2019 04:15:52 -0700
Subject: [PATCH] update multiBD config file

---
 dockers/docker-database/database_config.json | 9 +++++++--
 dockers/docker-database/supervisord.conf.j2  | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dockers/docker-database/database_config.json b/dockers/docker-database/database_config.json
index 6725af38c5ea..d5d951bead5d 100644
--- a/dockers/docker-database/database_config.json
+++ b/dockers/docker-database/database_config.json
@@ -1,8 +1,9 @@
 {
     "INSTANCES": {
         "redis":{
-            "port": 6379,
-            "socket": "/var/run/redis/redis.sock"
+            "hostname" : "127.0.0.1",
+            "port" : 6379,
+            "unix_socket_path" : "/var/run/redis/redis.sock"
         }
     },
     "DATABASES" : {
@@ -37,6 +38,10 @@
         "STATE_DB" : {
             "id" : 6,
             "instance" : "redis"
+        },
+        "SNMP_OVERLAY_DB" : {
+            "id" : 7,
+            "instance" : "redis"
         }
     },
     "VERSION" : "1.0"
diff --git a/dockers/docker-database/supervisord.conf.j2 b/dockers/docker-database/supervisord.conf.j2
index 9e4a42d6b3a4..110619f762be 100644
--- a/dockers/docker-database/supervisord.conf.j2
+++ b/dockers/docker-database/supervisord.conf.j2
@@ -14,7 +14,7 @@ stderr_logfile=syslog
 {% if INSTANCES %}
 {%     for redis_inst, redis_items in INSTANCES.iteritems() %}
 [program: {{ redis_inst }}]
-command=/bin/bash -c "{ [[ -s /var/lib/{{ redis_inst }}/dump.rdb ]] || rm -f /var/lib/{{ redis_inst }}/dump.rdb; } && mkdir -p /var/lib/{{ redis_inst }} && exec /usr/bin/redis-server /etc/redis/redis.conf --port {{ redis_items['port'] }} --unixsocket {{ redis_items['socket'] }} --pidfile /var/run/redis/{{ redis_inst }}.pid --dir /var/lib/{{ redis_inst }}"
+command=/bin/bash -c "{ [[ -s /var/lib/{{ redis_inst }}/dump.rdb ]] || rm -f /var/lib/{{ redis_inst }}/dump.rdb; } && mkdir -p /var/lib/{{ redis_inst }} && exec /usr/bin/redis-server /etc/redis/redis.conf --port {{ redis_items['port'] }} --unixsocket {{ redis_items['unix_socket_path'] }} --pidfile /var/run/redis/{{ redis_inst }}.pid --dir /var/lib/{{ redis_inst }}"
 priority=2
 autostart=true
 autorestart=false