summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2010-11-24 21:40:41 +0000
committerVishvananda Ishaya <vishvananda@gmail.com>2010-11-24 21:40:41 +0000
commitf74094cd303b21c12e8a83790d405bcae8103be8 (patch)
tree67ce06a5e41e3b99064cb991e08d44a61295bf2e
parenta7a24e2ac54b88ba09afe5966806f42181784e9d (diff)
downloadnova-f74094cd303b21c12e8a83790d405bcae8103be8.tar.gz
nova-f74094cd303b21c12e8a83790d405bcae8103be8.tar.xz
nova-f74094cd303b21c12e8a83790d405bcae8103be8.zip
don't error on edge case where vpn has been launched but fails to get a network
-rwxr-xr-xbin/nova-manage3
1 files changed, 2 insertions, 1 deletions
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'],