diff options
| author | andy <github@anarkystic.com> | 2010-06-24 04:11:53 +0100 |
|---|---|---|
| committer | andy <github@anarkystic.com> | 2010-06-24 04:11:53 +0100 |
| commit | c910b470e61a35230bc7ddaced13c3d51fac32fd (patch) | |
| tree | 2ba07dda547a228581ddb98a0391d5a39de08353 /nova/flags.py | |
| parent | 6dc4d23e01d1fcd8aa27d34d8b3b2cba5eac9573 (diff) | |
| download | nova-c910b470e61a35230bc7ddaced13c3d51fac32fd.tar.gz nova-c910b470e61a35230bc7ddaced13c3d51fac32fd.tar.xz nova-c910b470e61a35230bc7ddaced13c3d51fac32fd.zip | |
re-added cloudpipe
Conflicts:
bin/nova-manage
nova/auth/users.py
nova/compute/network.py
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/flags.py b/nova/flags.py index 7818e1b14..84a670e6b 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -68,6 +68,8 @@ DEFINE_string('default_instance_type', 'm1.small', 'default instance type to use, testing only') +DEFINE_string('vpn_image_id', 'ami-CLOUDPIPE', 'AMI for cloudpipe vpn server') + # UNUSED DEFINE_string('node_availability_zone', 'nova', |