← Back to branch summary

~0x44/nova/bug838466

« back to all changes in this revision

Viewing changes to nova/flags.py

  • Committer: Todd Willey
  • Date: 2010-07-15 04:21:17 UTC
  • mfrom: (131.1.4)
  • Revision ID: git-v1:fb2ea2cafd67fc1ef67edc969a1edf3a1d2fd7f7
fix merge errors

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/flags.py
74
74
                    'default instance type to use, testing only')
75
75
 
76
76
DEFINE_string('vpn_image_id', 'ami-CLOUDPIPE', 'AMI for cloudpipe vpn server')
 
77
DEFINE_string('vpn_key_suffix',
 
78
              '-key',
 
79
              'Suffix to add to project name for vpn key')
77
80
 
78
81
# UNUSED
79
82
DEFINE_string('node_availability_zone',