Merge branch 'master' into master

sonic-net · Dec 4, 2019 · 8f6e9f4 · 8f6e9f4
2 parents 85689ed + eec594a
commit 8f6e9f4
Show file tree

Hide file tree

Showing 108 changed files with 1,383 additions and 342 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -47,7 +47,7 @@
 [submodule "src/sonic-frr/frr"]
 	path = src/sonic-frr/frr
 	url = https://github.com/Azure/sonic-frr.git
-	branch = frr/7.1
+	branch = frr/7.2
 [submodule "platform/p4/p4-hlir/p4-hlir-v1.1"]
 	path = platform/p4/p4-hlir/p4-hlir-v1.1
 	url = https://github.com/p4lang/p4-hlir.git

diff --git a/Makefile.work b/Makefile.work
@@ -8,6 +8,7 @@
 #  * ENABLE_DHCP_GRAPH_SERVICE: Enables get-graph service to fetch minigraph files
 #    through http.
 #  * ENABLE_PDE: Enables platform development environment.
+#  * ENABLE_ZTP: Enables zero touch provisioning.
 #  * SHUTDOWN_BGP_ON_START: Sets admin-down state for all bgp peerings after restart.
 #  * ENABLE_PFCWD_ON_START: Enable PFC Watchdog (PFCWD) on server-facing ports
 #  * by default for TOR switch.
@@ -75,11 +76,11 @@ endif
 ifeq ($(BLDENV), stretch)
 SLAVE_DIR = sonic-slave-stretch
 else
-SLAVE_DIR = sonic-slave
+SLAVE_DIR = sonic-slave-jessie
 endif
 SLAVE_BASE_TAG = $(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) j2 $(SLAVE_DIR)/Dockerfile.j2 > $(SLAVE_DIR)/Dockerfile && sha1sum $(SLAVE_DIR)/Dockerfile | awk '{print substr($$1,0,11);}')
 SLAVE_TAG = $(shell cat $(SLAVE_DIR)/Dockerfile.user $(SLAVE_DIR)/Dockerfile | sha1sum | awk '{print substr($$1,0,11);}')
-SLAVE_BASE_IMAGE = $(SLAVE_DIR)-base
+SLAVE_BASE_IMAGE = $(SLAVE_DIR)
 SLAVE_IMAGE = $(SLAVE_BASE_IMAGE)-$(USER)
 
 OVERLAY_MODULE_CHECK := \
@@ -164,6 +165,7 @@ SONIC_BUILD_INSTRUCTION :=  make \
                            BUILD_TIMESTAMP=$(BUILD_TIMESTAMP) \
                            ENABLE_DHCP_GRAPH_SERVICE=$(ENABLE_DHCP_GRAPH_SERVICE) \
                            ENABLE_PDE=$(ENABLE_PDE) \
+                           ENABLE_ZTP=$(ENABLE_ZTP) \
                            SHUTDOWN_BGP_ON_START=$(SHUTDOWN_BGP_ON_START) \
                            SONIC_ENABLE_PFCWD_ON_START=$(ENABLE_PFCWD_ON_START) \
                            SONIC_ENABLE_SYNCD_RPC=$(ENABLE_SYNCD_RPC) \
@@ -188,7 +190,8 @@ PDESUBMODULES = src/sonic-linux-kernel \
                 src/redis-dump-load \
                 src/sonic-sairedis \
                 src/sonic-platform-daemons \
-                src/sonic-platform-pde
+                src/sonic-platform-pde \
+                src/sonic-ztp
 
 .PHONY: sonic-slave-build sonic-slave-bash init initpde reset
 

diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 *master*:
+Innovium: [![Innovium](https://sonic-jenkins.westus2.cloudapp.azure.com/job/innovium/job/buildimage-invm-all/badge/icon)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/innovium/job/buildimage-invm-all)
 Barefoot: [![Barefoot](https://sonic-jenkins.westus2.cloudapp.azure.com/job/barefoot/job/buildimage-bf-all/badge/icon)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/barefoot/job/buildimage-bf-all)
 Broadcom: [![Broadcom](https://sonic-jenkins.westus2.cloudapp.azure.com/job/broadcom/job/buildimage-brcm-all/badge/icon)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/broadcom/job/buildimage-brcm-all)
 Mellanox: [![Mellanox](https://sonic-jenkins.westus2.cloudapp.azure.com/job/mellanox/job/buildimage-mlnx-all/badge/icon)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/mellanox/job/buildimage-mlnx-all)
@@ -16,6 +17,7 @@ Mellanox: [![Mellanox](https://sonic-jenkins.westus2.cloudapp.azure.com/job/mell
 VS: [![VS](https://sonic-jenkins.westus2.cloudapp.azure.com/job/vs/job/buildimage-vs-201904/badge/icon)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/vs/job/buildimage-vs-201904)
 
 *201811*:
+Innovium: [![Innovium](https://sonic-jenkins.westus2.cloudapp.azure.com/job/innovium/job/buildimage-invm-201811/badge/icon)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/innovium/job/buildimage-invm-201811/)
 Broadcom: [![Broadcom](https://sonic-jenkins.westus2.cloudapp.azure.com/job/broadcom/job/buildimage-brcm-201811/badge/icon)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/broadcom/job/buildimage-brcm-201811/)
 Barefoot: [![Mellanox](https://sonic-jenkins.westus2.cloudapp.azure.com/job/barefoot/job/buildimage-bf-201811/badge/icon)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/barefoot/job/buildimage-bf-201811/)
 Centec: [![Centec](https://sonic-jenkins.westus2.cloudapp.azure.com/job/centec/job/buildimage-centec-201811/badge/icon)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/centec/job/buildimage-centec-201811/)

diff --git a/build_image.sh b/build_image.sh
@@ -96,7 +96,7 @@ elif [ "$IMAGE_TYPE" = "kvm" ]; then
 
     generate_onie_installer_image
 
-    SONIC_USERNAME=$USERNAME PASSWD=$PASSWORD sudo -E ./build_kvm_image.sh $KVM_IMAGE_DISK $onie_recovery_image $OUTPUT_ONIE_IMAGE $KVM_IMAGE_DISK_SIZE
+    SONIC_USERNAME=$USERNAME PASSWD=$PASSWORD sudo -E ./scripts/build_kvm_image.sh $KVM_IMAGE_DISK $onie_recovery_image $OUTPUT_ONIE_IMAGE $KVM_IMAGE_DISK_SIZE
 
     if [ $? -ne 0 ]; then
         echo "Error : build kvm image failed"

diff --git a/check_install.py b/check_install.py
@@ -24,7 +24,17 @@ def main():
     cmd_prompt = "%s@sonic:~\$ $" % args.u
     grub_selection = "The highlighted entry will be executed"
 
-    p = pexpect.spawn("telnet 127.0.0.1 %s" % args.p, timeout=600, logfile=sys.stdout)
+    i = 0
+    while True:
+        try:
+            p = pexpect.spawn("telnet 127.0.0.1 %s" % args.p, timeout=600, logfile=sys.stdout)
+            break
+        except Exception as e:
+            print str(e)
+            i += 1
+            if i == 10:
+                raise
+            time.sleep(1)
 
     # select ONIE embed
     p.expect(grub_selection)

diff --git a/device/arista/x86_64-arista_7170_64c/Arista-7170-64C/switch-sai.conf b/device/arista/x86_64-arista_7170_64c/Arista-7170-64C/switch-sai.conf
@@ -25,7 +25,7 @@
             "table-config": "share/tofinopd/switch/context.json",
             "tofino-bin": "share/tofinopd/switch/tofino.bin",
             "switchapi": "lib/libswitchapi.so",
-            "switchsai": "lib/libswitchsai.so",
+            "sai": "lib/libsai.so",
             "switchapi_port_add": false,
             "non_default_port_ppgs": 5
         }

diff --git a/device/arista/x86_64-arista_7170_64c/Arista-7170-64C/switch-tna-sai.conf b/device/arista/x86_64-arista_7170_64c/Arista-7170-64C/switch-tna-sai.conf
@@ -27,7 +27,7 @@
                         }
                     ],
                     "program-name": "switch",
-                    "switchsai": "lib/libswitchsai.so",
+                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,

diff --git a/device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/switch-sai.conf b/device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/switch-sai.conf
@@ -25,7 +25,7 @@
             "table-config": "share/tofinopd/switch/context.json",
             "tofino-bin": "share/tofinopd/switch/tofino.bin",
             "switchapi": "lib/libswitchapi.so",
-            "switchsai": "lib/libswitchsai.so",
+            "sai": "lib/libsai.so",
             "switchapi_port_add": false,
             "non_default_port_ppgs": 5
         }

diff --git a/device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/switch-tna-sai.conf b/device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/switch-tna-sai.conf
@@ -27,7 +27,7 @@
                         }
                     ],
                     "program-name": "switch",
-                    "switchsai": "lib/libswitchsai.so",
+                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,

diff --git a/...86_64-arista_7280cr3_32p4/Arista-7280CR3-C28S8/jr2-a7280cr3-32p4-28x100G-8x10G.config.bcm b/...86_64-arista_7280cr3_32p4/Arista-7280CR3-C28S8/jr2-a7280cr3-32p4-28x100G-8x10G.config.bcm
@@ -277,11 +277,15 @@ bcm_stat_interval.BCM8869X=1000
 mem_cache_enable_ecc.BCM8869X=1
 mem_cache_enable_parity.BCM8869X=1
 
-serdes_nif_clk_freq_in.BCM8869X=2
-serdes_nif_clk_freq_out.BCM8869X=1
-
-serdes_fabric_clk_freq_in.BCM8869X=2
-serdes_fabric_clk_freq_out.BCM8869X=1
+serdes_nif_clk_freq_in.BCM8869X_A0=2
+serdes_nif_clk_freq_out.BCM8869X_A0=1
+serdes_fabric_clk_freq_in.BCM8869X_A0=2
+serdes_fabric_clk_freq_out.BCM8869X_A0=1
+
+serdes_nif_clk_freq_in.BCM8869X=1
+serdes_nif_clk_freq_out.BCM8869X=bypass
+serdes_fabric_clk_freq_in.BCM8869X=1
+serdes_fabric_clk_freq_out.BCM8869X=bypass
 
 dram_phy_tune_mode_on_init.BCM8869X=RUN_TUNE
 

diff --git a/...arista/x86_64-arista_7280cr3_32p4/Arista-7280CR3-C40/jr2-a7280cr3-32p4-40x100G.config.bcm b/...arista/x86_64-arista_7280cr3_32p4/Arista-7280CR3-C40/jr2-a7280cr3-32p4-40x100G.config.bcm
@@ -281,11 +281,15 @@ bcm_stat_interval.BCM8869X=1000
 mem_cache_enable_ecc.BCM8869X=1
 mem_cache_enable_parity.BCM8869X=1
 
-serdes_nif_clk_freq_in.BCM8869X=2
-serdes_nif_clk_freq_out.BCM8869X=1
-
-serdes_fabric_clk_freq_in.BCM8869X=2
-serdes_fabric_clk_freq_out.BCM8869X=1
+serdes_nif_clk_freq_in.BCM8869X_A0=2
+serdes_nif_clk_freq_out.BCM8869X_A0=1
+serdes_fabric_clk_freq_in.BCM8869X_A0=2
+serdes_fabric_clk_freq_out.BCM8869X_A0=1
+
+serdes_nif_clk_freq_in.BCM8869X=1
+serdes_nif_clk_freq_out.BCM8869X=bypass
+serdes_fabric_clk_freq_in.BCM8869X=1
+serdes_fabric_clk_freq_out.BCM8869X=bypass
 
 dram_phy_tune_mode_on_init.BCM8869X=RUN_TUNE
 

diff --git a/device/barefoot/x86_64-accton_as9516bf_32d-r0/newport/buffers_defaults_t0.j2 b/device/barefoot/x86_64-accton_as9516bf_32d-r0/newport/buffers_defaults_t0.j2
@@ -1,8 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '4194304' %}
-{% set ingress_lossy_pool_size =  '7340032' %}
-{% set egress_lossless_pool_size =  '16777152' %}
-{% set egress_lossy_pool_size =  '7340032' %}
+{% set ingress_lossless_pool_size =  '23850816' %}
+{% set ingress_lossy_pool_size =  '36222208' %}
+{% set egress_lossless_pool_size =  '29482816' %}
+{% set egress_lossy_pool_size =  '26400000' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
@@ -17,7 +17,7 @@
             "size": "{{ ingress_lossless_pool_size }}",
             "type": "ingress",
             "mode": "dynamic",
-            "xoff": "2867200"
+            "xoff": "36222208"
         },
         "ingress_lossy_pool": {
             "size": "{{ ingress_lossy_pool_size }}",

diff --git a/device/barefoot/x86_64-accton_as9516bf_32d-r0/newport/buffers_defaults_t1.j2 b/device/barefoot/x86_64-accton_as9516bf_32d-r0/newport/buffers_defaults_t1.j2
@@ -1,8 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '2097152' %}
-{% set ingress_lossy_pool_size =  '5242880' %}
-{% set egress_lossless_pool_size =  '16777152' %}
-{% set egress_lossy_pool_size =  '5242880' %}
+{% set ingress_lossless_pool_size =  '23850816' %}
+{% set ingress_lossy_pool_size =  '36222208' %}
+{% set egress_lossless_pool_size =  '29482816' %}
+{% set egress_lossy_pool_size =  '26400000' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
@@ -17,7 +17,7 @@
             "size": "{{ ingress_lossless_pool_size }}",
             "type": "ingress",
             "mode": "dynamic",
-            "xoff": "2867200"
+            "xoff": "36222208"
         },
         "ingress_lossy_pool": {
             "size": "{{ ingress_lossy_pool_size }}",

diff --git a/device/barefoot/x86_64-accton_as9516bf_32d-r0/newport/switch-tna-sai.conf b/device/barefoot/x86_64-accton_as9516bf_32d-r0/newport/switch-tna-sai.conf
@@ -28,11 +28,12 @@
                         }
                     ],
                     "program-name": "switch",
-                    "switchsai": "lib/libswitchsai.so",
+                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
-                    "non_default_port_ppgs": 5
+                    "non_default_port_ppgs": 5,
+                    "cpu_port": "eth2"
                 }
             ]
         }

diff --git a/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/switch-sai.conf b/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/switch-sai.conf
@@ -25,7 +25,7 @@
             "table-config": "share/tofinopd/switch/context.json",
             "tofino-bin": "share/tofinopd/switch/tofino.bin",
             "switchapi": "lib/libswitchapi.so",
-            "switchsai": "lib/libswitchsai.so",
+            "sai": "lib/libsai.so",
             "agent0": "lib/platform/x86_64-accton_wedge100bf_32x-r0/libpltfm_mgr.so",
             "switchapi_port_add": false,
             "non_default_port_ppgs": 5

diff --git a/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/switch-tna-sai.conf b/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/switch-tna-sai.conf
@@ -28,7 +28,7 @@
                         }
                     ],
                     "program-name": "switch",
-                    "switchsai": "lib/libswitchsai.so",
+                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,

diff --git a/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/switch-sai.conf b/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/switch-sai.conf
@@ -25,7 +25,7 @@
             "table-config": "share/tofinopd/switch/context.json",
             "tofino-bin": "share/tofinopd/switch/tofino.bin",
             "switchapi": "lib/libswitchapi.so",
-            "switchsai": "lib/libswitchsai.so",
+            "sai": "lib/libsai.so",
             "agent0": "lib/platform/x86_64-accton_wedge100bf_65x-r0/libpltfm_mgr.so",
             "switchapi_port_add": false,
             "non_default_port_ppgs": 5

diff --git a/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/switch-tna-sai.conf b/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/switch-tna-sai.conf
@@ -28,7 +28,7 @@
                         }
                     ],
                     "program-name": "switch",
-                    "switchsai": "lib/libswitchsai.so",
+                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,

diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/pmon_daemon_control.json b/device/dell/x86_64-dell_s6000_s1220-r0/pmon_daemon_control.json
@@ -0,0 +1,3 @@
+{
+    "skip_ledd": true
+}
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/pmon_daemon_control.json b/device/dell/x86_64-dell_s6100_c2538-r0/pmon_daemon_control.json
@@ -0,0 +1,3 @@
+{
+    "skip_ledd": true
+}
diff --git a/device/dell/x86_64-dell_z9100_c2538-r0/pmon_daemon_control.json b/device/dell/x86_64-dell_z9100_c2538-r0/pmon_daemon_control.json
@@ -0,0 +1,3 @@
+{
+    "skip_ledd": true
+}
diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/pmon_daemon_control.json b/device/dell/x86_64-dellemc_s5232f_c3538-r0/pmon_daemon_control.json
@@ -0,0 +1,3 @@
+{
+    "skip_ledd": true
+}
diff --git a/device/dell/x86_64-dellemc_s5248f_c3538-r0/pmon_daemon_control.json b/device/dell/x86_64-dellemc_s5248f_c3538-r0/pmon_daemon_control.json
@@ -0,0 +1,3 @@
+{
+    "skip_ledd": true
+}
diff --git a/device/dell/x86_64-dellemc_z9264f_c3538-r0/pmon_daemon_control.json b/device/dell/x86_64-dellemc_z9264f_c3538-r0/pmon_daemon_control.json
@@ -0,0 +1,3 @@
+{
+    "skip_ledd": true
+}
diff --git a/device/ingrasys/x86_64-ingrasys_s9180_32x-r0/INGRASYS-S9180-32X/switch-sai.conf b/device/ingrasys/x86_64-ingrasys_s9180_32x-r0/INGRASYS-S9180-32X/switch-sai.conf
@@ -25,7 +25,7 @@
             "table-config": "share/tofinopd/switch/context.json",
             "tofino-bin": "share/tofinopd/switch/tofino.bin",
             "switchapi": "lib/libswitchapi.so",
-            "switchsai": "lib/libswitchsai.so",
+            "sai": "lib/libsai.so",
             "agent0": "lib/platform/x86_64-ingrasys_s9180_32x-r0/libpltfm_mgr.so",
             "switchapi_port_add": false
         }

diff --git a/device/ingrasys/x86_64-ingrasys_s9180_32x-r0/INGRASYS-S9180-32X/switch-tna-sai.conf b/device/ingrasys/x86_64-ingrasys_s9180_32x-r0/INGRASYS-S9180-32X/switch-tna-sai.conf
@@ -28,7 +28,7 @@
                         }
                     ],
                     "program-name": "switch",
-                    "switchsai": "lib/libswitchsai.so",
+                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,

diff --git a/device/ingrasys/x86_64-ingrasys_s9280_64x-r0/INGRASYS-S9280-64X/switch-sai.conf b/device/ingrasys/x86_64-ingrasys_s9280_64x-r0/INGRASYS-S9280-64X/switch-sai.conf
@@ -25,7 +25,7 @@
             "table-config": "share/tofinopd/switch/context.json",
             "tofino-bin": "share/tofinopd/switch/tofino.bin",
             "switchapi": "lib/libswitchapi.so",
-            "switchsai": "lib/libswitchsai.so",
+            "sai": "lib/libsai.so",
             "agent0": "lib/platform/x86_64-ingrasys_s9280_64x-r0/libpltfm_mgr.so",
             "switchapi_port_add": false
         }

diff --git a/device/ingrasys/x86_64-ingrasys_s9280_64x-r0/INGRASYS-S9280-64X/switch-tna-sai.conf b/device/ingrasys/x86_64-ingrasys_s9280_64x-r0/INGRASYS-S9280-64X/switch-tna-sai.conf
@@ -28,7 +28,7 @@
                         }
                     ],
                     "program-name": "switch",
-                    "switchsai": "lib/libswitchsai.so",
+                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,

diff --git a/device/wnc/x86_64-wnc_osw1800-r0/OSW1800-48x6q/switch-sai.conf b/device/wnc/x86_64-wnc_osw1800-r0/OSW1800-48x6q/switch-sai.conf
@@ -25,7 +25,7 @@
             "table-config": "share/tofinopd/switch/context.json",
             "tofino-bin": "share/tofinopd/switch/tofino.bin",
             "switchapi": "lib/libswitchapi.so",
-            "switchsai": "lib/libswitchsai.so",
+            "sai": "lib/libsai.so",
             "agent0": "lib/platform/x86_64-wnc_osw1800-r0/libpltfm_mgr.so",
             "switchapi_port_add": false
         }

diff --git a/device/wnc/x86_64-wnc_osw1800-r0/OSW1800-48x6q/switch-tna-sai.conf b/device/wnc/x86_64-wnc_osw1800-r0/OSW1800-48x6q/switch-tna-sai.conf
@@ -28,7 +28,7 @@
                         }
                     ],
                     "program-name": "switch",
-                    "switchsai": "lib/libswitchsai.so",
+                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,

diff --git a/dockers/docker-base-stretch/Dockerfile.j2 b/dockers/docker-base-stretch/Dockerfile.j2
@@ -83,4 +83,6 @@ COPY ["etc/rsyslog.conf", "/etc/rsyslog.conf"]
 COPY ["etc/rsyslog.d/*", "/etc/rsyslog.d/"]
 COPY ["root/.vimrc", "/root/.vimrc"]
 
+RUN ln /usr/bin/vim.tiny /usr/bin/vim
+
 COPY ["etc/supervisor/supervisord.conf", "/etc/supervisor/"]
diff --git a/dockers/docker-dhcp-relay/start.sh b/dockers/docker-dhcp-relay/start.sh
@@ -16,6 +16,12 @@ if [ $(supervisorctl status | grep -c "^isc-dhcp-relay:") -gt 0 ]; then
     # lifetime of the process.
     /usr/bin/wait_for_intf.sh
 
+    # Allow a bit more time for interfaces to settle before starting the
+    # relay agent processes.
+    # FIXME: Remove/decrease this once we determine how to prevent future race
+    # conditions here.
+    sleep 180
+
     # Start all DHCP relay agent(s)
     supervisorctl start isc-dhcp-relay:*
 fi