From 7e44bb6d21c41f9408f173398a2173b30af6c91f Mon Sep 17 00:00:00 2001 From: Chinmay Gadgil Date: Mon, 12 Jul 2021 10:30:20 -0700 Subject: [PATCH] Use MULTUS_MASTER_CNI_FILE_NAME as MASTER_PLUGIN as is, if specified --- images/entrypoint.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/entrypoint.sh b/images/entrypoint.sh index 9ee678826..96db48dc0 100755 --- a/images/entrypoint.sh +++ b/images/entrypoint.sh @@ -268,7 +268,7 @@ if [ "$MULTUS_CONF_FILE" == "auto" ]; then tries=0 while [ $found_master == false ]; do if [ "$MULTUS_MASTER_CNI_FILE_NAME" != "" ]; then - MASTER_PLUGIN="$(ls $MULTUS_AUTOCONF_DIR/$MULTUS_MASTER_CNI_FILE_NAME)" || true + MASTER_PLUGIN="$MULTUS_MASTER_CNI_FILE_NAME" else MASTER_PLUGIN="$(ls $MULTUS_AUTOCONF_DIR | grep -E '\.conf(list)?$' | grep -Ev '00-multus\.conf' | head -1)" fi @@ -284,6 +284,7 @@ if [ "$MULTUS_CONF_FILE" == "auto" ]; then exit 1; fi else + log "Using MASTER_PLUGIN: $MASTER_PLUGIN" found_master=true