diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-10-12 22:04:46 +0200 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-10-12 22:04:46 +0200 |
| commit | e0dff8694ed11f03760bf4dc251fccc422035acf (patch) | |
| tree | 3faf4865371d726866602739ecf1e99fc8ebc14a /nova/auth | |
| parent | ac1dfd25c4b356c1725339709e535d4147feda3c (diff) | |
| parent | 70b8321347c02e9c0799cabd3e9c670f80b031a8 (diff) | |
Merge trunk.
Diffstat (limited to 'nova/auth')
| -rw-r--r-- | nova/auth/manager.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/auth/manager.py b/nova/auth/manager.py index 8718cb00a..58e33969b 100644 --- a/nova/auth/manager.py +++ b/nova/auth/manager.py @@ -655,7 +655,10 @@ class AuthManager(object): zippy.writestr(FLAGS.credential_key_file, private_key) zippy.writestr(FLAGS.credential_cert_file, signed_cert) - (vpn_ip, vpn_port) = self.get_project_vpn_data(project) + try: + (vpn_ip, vpn_port) = self.get_project_vpn_data(project) + except exception.NotFound: + vpn_ip = None if vpn_ip: configfile = open(FLAGS.vpn_client_template, "r") s = string.Template(configfile.read()) |