Merge "Use choices kwarg when defining string options with defined choices"

This commit is contained in:
Jenkins 2015-11-13 15:31:41 +00:00 committed by Gerrit Code Review
commit 88d0e77b25
1 changed files with 2 additions and 0 deletions

View File

@ -255,6 +255,7 @@ ComputeGroup = [
"when sshing to a guest."),
cfg.StrOpt('ssh_auth_method',
default='keypair',
choices=('keypair', 'configured', 'adminpass', 'disabled'),
help="Auth method used for authenticate to the instance. "
"Valid choices are: keypair, configured, adminpass "
"and disabled. "
@ -264,6 +265,7 @@ ComputeGroup = [
"Disabled: avoid using ssh when it is an option."),
cfg.StrOpt('ssh_connect_method',
default='floating',
choices=('fixed', 'floating'),
help="How to connect to the instance? "
"fixed: using the first ip belongs the fixed network "
"floating: creating and using a floating ip."),