From 9620216b3547cdf90c4f1013d64e03deca413056 Mon Sep 17 00:00:00 2001
From: Hongbin Lu <hongbin034@gmail.com>
Date: Tue, 5 May 2020 01:26:18 +0000
Subject: [PATCH] Tolerate non-existing of cni config file

Change-Id: I761bf9344651ec196471ca57bf0b29184a69e161
---
 devstack/lib/cni/plugins | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devstack/lib/cni/plugins b/devstack/lib/cni/plugins
index e28d911..eb00995 100644
--- a/devstack/lib/cni/plugins
+++ b/devstack/lib/cni/plugins
@@ -78,7 +78,7 @@ function configure_cni_plugins {
 
     for plugin in ${CNI_PLUGINS_INSTALL_PLUGINS//,/ }; do
         local source_config_file
-        source_config_file=$(ls ${CNI_PLUGINS_CONF_SOURCE_DIR}/*${plugin}.conf 2> /dev/null)
+        source_config_file=$(ls ${CNI_PLUGINS_CONF_SOURCE_DIR}/*${plugin}.conf 2> /dev/null || true)
         if [ $source_config_file ]; then
             echo "Found config file for plugin: $plugin"
             sudo install -o "$STACK_USER" -m 0664 -t "$CNI_PLUGINS_CONF_DIR" -D \