Make CLI timeout tests configurable

Add an option for configuring the timeout used in the compute
and keystone CLI tests.

Closes-Bug: #1208846

Change-Id: Ia8f2fe528da7c6f294a1047d1d8b84239ce17adc

tempest/cli/__init__.py

@@ -35,6 +35,9 @@ cli_opts = [
     cfg.StrOpt('cli_dir',
                default='/usr/local/bin/',
                help="directory where python client binaries are located"),
+    cfg.IntOpt('timeout',
+               default=15,
+               help="Number of seconds to wait on a CLI timeout"),
 ]
 
 CONF = cfg.CONF