From f74094cd303b21c12e8a83790d405bcae8103be8 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Wed, 24 Nov 2010 21:40:41 +0000
Subject: don't error on edge case where vpn has been launched but fails to get
 a network

---
 bin/nova-manage | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/nova-manage b/bin/nova-manage
index 3d0122637..7c07ce3f0 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -120,7 +120,8 @@ class VpnCommands(object):
                 state = 'down'
                 if vpn.get('fixed_ip', None):
                     address = vpn['fixed_ip']['address']
-                if utils.vpn_ping(project.vpn_ip, project.vpn_port):
+                if project.vpn_ip and utils.vpn_ping(project.vpn_ip,
+                                                     project.vpn_port):
                     state = 'up'
                 print address,
                 print vpn['host'],
-- 
cgit