From 49c16a368ee4e1f1ba99a04883f7342f964ab7a9 Mon Sep 17 00:00:00 2001 From: Wes Hayutin Date: Mon, 4 Jan 2021 12:39:44 -0700 Subject: [PATCH] ensure any ens3 interface is nuked during image build It seems as though w/ CentOS-8.3 ens3 has crept back into play. Ensure it's not in the overcloud images. See bug for details. Closes-Bug: #1910107 Change-Id: I29d632814577db0b720b07d4497983e267d46a4e (cherry picked from commit d072a79acf52a87333fa663059eb769009b8fb4e) --- elements/interface-names/install.d/71-clean-stale-interface | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/elements/interface-names/install.d/71-clean-stale-interface b/elements/interface-names/install.d/71-clean-stale-interface index 138760ede..38fd4a8f7 100755 --- a/elements/interface-names/install.d/71-clean-stale-interface +++ b/elements/interface-names/install.d/71-clean-stale-interface @@ -4,6 +4,6 @@ set -eux set -o pipefail # https://bugs.centos.org/view.php?id=17133 -if [ -f /etc/sysconfig/network-scripts/ifcfg-ens3 ]; then - rm -f /etc/sysconfig/network-scripts/ifcfg-ens3 +if ls /etc/sysconfig/network-scripts/ifcfg-ens3* &> /dev/null; then + rm -f /etc/sysconfig/network-scripts/ifcfg-ens3* fi