Tolerate non-existing of cni config file

Change-Id: I761bf9344651ec196471ca57bf0b29184a69e161 (cherry picked from commit 9620216b35)
Update .gitreview for stable/ussuri
2020-05-06 01:05:11 +00:00 · 2020-04-28 17:09:29 +00:00
2 changed files with 2 additions and 1 deletions
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/devstack-plugin-container.git
+defaultbranch=stable/ussuri
--- 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 \
Author	SHA1	Message	Date
Hongbin Lu	e37ec8fa5e	Tolerate non-existing of cni config file Change-Id: I761bf9344651ec196471ca57bf0b29184a69e161 (cherry picked from commit `9620216b35`)	2020-05-06 01:05:11 +00:00
OpenStack Release Bot	c86dae7f57	Update .gitreview for stable/ussuri Change-Id: I14f47a83653233325643649ef7789f15ab62b192	2020-04-28 17:09:29 +00:00