Merge "Document choices using oslo.config interface"
diff --git a/tempest/config.py b/tempest/config.py
index 0b6d409..250a03e 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -888,10 +888,11 @@
help='Enable/disable security group rules.'),
cfg.StrOpt('connect_method',
default='floating',
- choices=['fixed', 'floating'],
- help='Default IP type used for validation: '
- '-fixed: uses the first IP belonging to the fixed network '
- '-floating: creates and uses a floating IP'),
+ choices=[('fixed',
+ 'uses the first IP belonging to the fixed network'),
+ ('floating',
+ 'creates and uses a floating IP')],
+ help='Default IP type used for validation'),
cfg.StrOpt('auth_method',
default='keypair',
choices=['keypair'],