From c2c7c95005cd8ec5986066db87b786495cf930a3 Mon Sep 17 00:00:00 2001 From: Jiri Podivin Date: Thu, 5 Dec 2024 11:50:52 +0100 Subject: [PATCH] Restoring expansion in interface scripts Signed-off-by: Jiri Podivin --- devsetup/scripts/bmaas/attach-network.sh | 2 +- devsetup/scripts/bmaas/baremetal-bridge.sh | 2 +- devsetup/scripts/bmaas/generate-nodes-yaml.sh | 2 +- devsetup/scripts/bmaas/network-attachement-definition.sh | 2 +- devsetup/scripts/bmaas/sushy-emulator.sh | 2 +- devsetup/scripts/crc-setup.sh | 2 +- devsetup/scripts/interfaces-setup-cleanup.sh | 2 +- devsetup/scripts/interfaces-setup.sh | 2 +- devsetup/scripts/network-setup.sh | 2 +- scripts/gen-ceph-kustomize.sh | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/devsetup/scripts/bmaas/attach-network.sh b/devsetup/scripts/bmaas/attach-network.sh index dcbdc291..47062b35 100755 --- a/devsetup/scripts/bmaas/attach-network.sh +++ b/devsetup/scripts/bmaas/attach-network.sh @@ -1,5 +1,5 @@ #!/bin/bash -# set -x +set -x if [ "$EUID" -eq 0 ]; then echo "Please do not run as root." diff --git a/devsetup/scripts/bmaas/baremetal-bridge.sh b/devsetup/scripts/bmaas/baremetal-bridge.sh index e49afb94..3f7bc83a 100755 --- a/devsetup/scripts/bmaas/baremetal-bridge.sh +++ b/devsetup/scripts/bmaas/baremetal-bridge.sh @@ -1,5 +1,5 @@ #!/bin/bash -# set -x +set -x if [ "$EUID" -eq 0 ]; then echo "Please do not run as root." diff --git a/devsetup/scripts/bmaas/generate-nodes-yaml.sh b/devsetup/scripts/bmaas/generate-nodes-yaml.sh index 930256a9..1385b8bd 100755 --- a/devsetup/scripts/bmaas/generate-nodes-yaml.sh +++ b/devsetup/scripts/bmaas/generate-nodes-yaml.sh @@ -1,5 +1,5 @@ #!/bin/bash -# set -x +set -x NODE_NAME_PREFIX=${NODE_NAME_PREFIX:-"crc-bmaas"} INGRESS_DOMAIN=$(oc get ingresses.config/cluster -o jsonpath={.spec.domain}) diff --git a/devsetup/scripts/bmaas/network-attachement-definition.sh b/devsetup/scripts/bmaas/network-attachement-definition.sh index 7389908f..6154724d 100755 --- a/devsetup/scripts/bmaas/network-attachement-definition.sh +++ b/devsetup/scripts/bmaas/network-attachement-definition.sh @@ -1,5 +1,5 @@ #!/bin/bash -# set -x +set -x if [ "$EUID" -eq 0 ]; then echo "Please do not run as root." diff --git a/devsetup/scripts/bmaas/sushy-emulator.sh b/devsetup/scripts/bmaas/sushy-emulator.sh index 9d4bba3c..adf3be50 100755 --- a/devsetup/scripts/bmaas/sushy-emulator.sh +++ b/devsetup/scripts/bmaas/sushy-emulator.sh @@ -1,5 +1,5 @@ #!/bin/bash -# set -x +set -x if [ "$EUID" -eq 0 ]; then echo "Please do not run as root." diff --git a/devsetup/scripts/crc-setup.sh b/devsetup/scripts/crc-setup.sh index bfca5201..18d9b7f9 100755 --- a/devsetup/scripts/crc-setup.sh +++ b/devsetup/scripts/crc-setup.sh @@ -1,5 +1,5 @@ #!/bin/bash -# set -x +set -x if [ "$EUID" -eq 0 ]; then echo "Please do not run as root." diff --git a/devsetup/scripts/interfaces-setup-cleanup.sh b/devsetup/scripts/interfaces-setup-cleanup.sh index e69e7192..9f67b854 100644 --- a/devsetup/scripts/interfaces-setup-cleanup.sh +++ b/devsetup/scripts/interfaces-setup-cleanup.sh @@ -1,5 +1,5 @@ #!/bin/bash -# set -x +set -x if [ "$EUID" -eq 0 ]; then echo "Please do not run as root." diff --git a/devsetup/scripts/interfaces-setup.sh b/devsetup/scripts/interfaces-setup.sh index 2413fccf..54040680 100644 --- a/devsetup/scripts/interfaces-setup.sh +++ b/devsetup/scripts/interfaces-setup.sh @@ -1,5 +1,5 @@ #!/bin/bash -# set -x +set -x if [ "$EUID" -eq 0 ]; then echo "Please do not run as root." diff --git a/devsetup/scripts/network-setup.sh b/devsetup/scripts/network-setup.sh index e535076a..8df52945 100755 --- a/devsetup/scripts/network-setup.sh +++ b/devsetup/scripts/network-setup.sh @@ -1,5 +1,5 @@ #!/bin/bash -# set -x +set -x if [ "$EUID" -eq 0 ]; then echo "Please do not run as root." diff --git a/scripts/gen-ceph-kustomize.sh b/scripts/gen-ceph-kustomize.sh index 27af5be8..3b168301 100644 --- a/scripts/gen-ceph-kustomize.sh +++ b/scripts/gen-ceph-kustomize.sh @@ -13,7 +13,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -# set -ex +set -ex # expect that the common.sh is in the same dir as the calling script SCRIPTPATH="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"