Move bgp_admin_state to configdb

sonic-net · Jul 16, 2017 · 79f1e17 · 79f1e17
1 parent 419e036
commit 79f1e17
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 11 deletions.
diff --git a/dockers/docker-database/Dockerfile.j2 b/dockers/docker-database/Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM docker-base
+FROM docker-config-engine
 
 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
@@ -33,5 +33,6 @@ RUN sed -ri 's/^(save .*$)/# \1/g;
             ' /etc/redis/redis.conf
 
 COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
+COPY ["start.sh", "/usr/bin/"]
 
 ENTRYPOINT ["/usr/bin/supervisord"]
diff --git a/dockers/docker-database/start.sh b/dockers/docker-database/start.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+supervisorctl start redis-server
+
+# If this platform has an initialization file for the Broadcom LED microprocessor, load it
+if [ -r /etc/sonic/config_db.json ]; then
+    # Wait until redis starts
+    while true; do
+        if [ -e /var/run/redis/redis.sock ]; then
+            break
+        fi
+        sleep 1
+    done
+
+    sonic-cfggen -j /etc/sonic/config_db.json -D
+fi
+
diff --git a/dockers/docker-database/supervisord.conf b/dockers/docker-database/supervisord.conf
@@ -3,10 +3,19 @@ logfile_maxbytes=1MB
 logfile_backups=2
 nodaemon=true
 
-[program:redis-server]
-command=/usr/bin/redis-server /etc/redis/redis.conf
+[program:start.sh]
+command=/usr/bin/start.sh
 priority=1
 autostart=true
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
+
+[program:redis-server]
+command=/usr/bin/redis-server /etc/redis/redis.conf
+priority=2
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+
diff --git a/dockers/docker-fpm-quagga/start.sh b/dockers/docker-fpm-quagga/start.sh
@@ -1,11 +1,8 @@
 #!/usr/bin/env bash
 
 mkdir -p /etc/quagga
-if [ -f /etc/sonic/bgp_admin.yml ]; then
-    sonic-cfggen -m /etc/sonic/minigraph.xml -y /etc/sonic/bgp_admin.yml -y /etc/sonic/deployment_id_asn_map.yml -t /usr/share/sonic/templates/bgpd.conf.j2 > /etc/quagga/bgpd.conf
-else
-    sonic-cfggen -m /etc/sonic/minigraph.xml -y /etc/sonic/deployment_id_asn_map.yml -t /usr/share/sonic/templates/bgpd.conf.j2 > /etc/quagga/bgpd.conf
-fi
+sonic-cfggen -m -d -y /etc/sonic/deployment_id_asn_map.yml -t /usr/share/sonic/templates/bgpd.conf.j2 > /etc/quagga/bgpd.conf
+
 sonic-cfggen -m /etc/sonic/minigraph.xml -t /usr/share/sonic/templates/zebra.conf.j2 > /etc/quagga/zebra.conf
 
 sonic-cfggen -m /etc/sonic/minigraph.xml -t /usr/share/sonic/templates/isolate.j2 > /usr/sbin/bgp-isolate

diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
@@ -132,8 +132,7 @@ sudo bash -c "echo dhcp_as_static=true >> $FILESYSTEM_ROOT/etc/sonic/updategraph
 sudo bash -c "echo enabled=false > $FILESYSTEM_ROOT/etc/sonic/updategraph.conf"
 {% endif %}
 {% if shutdown_bgp_on_start == "y" %}
-sudo bash -c "echo bgp_admin_state: > $FILESYSTEM_ROOT/etc/sonic/bgp_admin.yml"
-sudo bash -c "echo '  all: off' >> $FILESYSTEM_ROOT/etc/sonic/bgp_admin.yml"
+sudo bash -c "echo '{ \"bgp_admin_state\": { \"all\": false }  }' >> $FILESYSTEM_ROOT/etc/sonic/config_db.json"
 {% endif %}
 # Copy SNMP configuration files
 sudo cp $IMAGE_CONFIGS/snmp/snmp.yml $FILESYSTEM_ROOT/etc/sonic/

diff --git a/rules/docker-database.mk b/rules/docker-database.mk
@@ -3,11 +3,12 @@
 DOCKER_DATABASE = docker-database.gz
 $(DOCKER_DATABASE)_PATH = $(DOCKERS_PATH)/docker-database
 $(DOCKER_DATABASE)_DEPENDS += $(REDIS_SERVER) $(REDIS_TOOLS)
-$(DOCKER_DATABASE)_LOAD_DOCKERS += $(DOCKER_BASE)
+$(DOCKER_DATABASE)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
 SONIC_DOCKER_IMAGES += $(DOCKER_DATABASE)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_DATABASE)
 
 $(DOCKER_DATABASE)_CONTAINER_NAME = database
 $(DOCKER_DATABASE)_RUN_OPT += --net=host --privileged -t
+$(DOCKER_DATABASE)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 
 $(DOCKER_DATABASE)_BASE_IMAGE_FILES += redis-cli:/usr/bin/redis-cli