From 08890511599f97f71ec95149abcd1703ac060ed4 Mon Sep 17 00:00:00 2001 From: Dao Cong Tien Date: Fri, 4 May 2018 17:32:08 +0700 Subject: [PATCH] Rescue bug: tinyipa fails to acquire IP in multitenant env It seems the udhcpc script is not executable and no sleeping cause tinyipa fails to acquire IP in multi-tenant env. Story: #2002024 Change-Id: I3a693d75bfa54fe905bd3cd0587bb139934c087c --- imagebuild/tinyipa/build_files/bootlocal.sh | 2 ++ imagebuild/tinyipa/udhcpc.script | 0 .../tinyipa-rescue-dhcp-multi-tenant-b32bda7bf2b12679.yaml | 5 +++++ 3 files changed, 7 insertions(+) mode change 100644 => 100755 imagebuild/tinyipa/udhcpc.script create mode 100644 releasenotes/notes/tinyipa-rescue-dhcp-multi-tenant-b32bda7bf2b12679.yaml diff --git a/imagebuild/tinyipa/build_files/bootlocal.sh b/imagebuild/tinyipa/build_files/bootlocal.sh index a94a67d50..6d0c8ea62 100755 --- a/imagebuild/tinyipa/build_files/bootlocal.sh +++ b/imagebuild/tinyipa/build_files/bootlocal.sh @@ -53,6 +53,8 @@ configure_dhcp_network() { # NOTE(TheJulia): We may need to add a short wait here as # network interface plugging actions may not be asynchronous. + echo "Sleeping 30 sec as network interface is being updated" + sleep 30 INTERFACES=$(ip -o link |grep "LOWER_UP"|cut -f2 -d" "|sed 's/://'|grep -v "lo") for interface in $INTERFACES; do pidfile="/var/run/udhcpc/${interface}.pid" diff --git a/imagebuild/tinyipa/udhcpc.script b/imagebuild/tinyipa/udhcpc.script old mode 100644 new mode 100755 diff --git a/releasenotes/notes/tinyipa-rescue-dhcp-multi-tenant-b32bda7bf2b12679.yaml b/releasenotes/notes/tinyipa-rescue-dhcp-multi-tenant-b32bda7bf2b12679.yaml new file mode 100644 index 000000000..58e40d8c9 --- /dev/null +++ b/releasenotes/notes/tinyipa-rescue-dhcp-multi-tenant-b32bda7bf2b12679.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixes bug where TinyIPA fails to acquire IP address when + in RESCUE state and in multi-tenant environment.