From 8cdf0aeeeca225c44d694d6c35c9201d65fd2216 Mon Sep 17 00:00:00 2001 From: "Manuel Amador (Rudd-O)" Date: Tue, 7 Sep 2010 14:43:42 -0700 Subject: [PATCH] Bug fix: ignore ifaces that have no ip addresses in cloud-setup-databases --- setup/bindir/cloud-setup-databases.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup/bindir/cloud-setup-databases.in b/setup/bindir/cloud-setup-databases.in index e12a4c99d48..9543cb19571 100755 --- a/setup/bindir/cloud-setup-databases.in +++ b/setup/bindir/cloud-setup-databases.in @@ -171,7 +171,8 @@ def ifaces(): def ip(iface): status,lines = commands.getstatusoutput('LANG=C /sbin/ip address show %s'%iface) - assert status == 0 + if status != 0: return False + #used to say: assert status == 0 but it caused a bug in ifaces without IP lines = [ l for l in lines.splitlines() if l.startswith(' inet ') ] if not lines: return None toks = lines[0].split()