Command line switch for standard threads.

Whitespace cleanup
Pep 8 line length fix

Bug 1039112

Change-Id: Ib11a6817f999802d90764404a5efbde33ce6e9eb

bin/keystone-all

@@ -18,7 +18,6 @@ if os.path.exists(os.path.join(possible_topdir,
                                '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
-eventlet.patcher.monkey_patch(all=False, socket=True, time=True, thread=True)
 
 from paste import deploy
 
@@ -91,6 +90,10 @@ if __name__ == '__main__':
         CONF.print_help()
         sys.exit(1)
 
+    monkeypatch_thread = not CONF._cli_values['standard_threads']
+    eventlet.patcher.monkey_patch(all=False, socket=True, time=True,
+                                  thread=monkeypatch_thread)
+
     options = deploy.appconfig('config:%s' % CONF.config_file[0])
 
     servers = []

keystone/config.py

@@ -117,6 +117,7 @@ register_str('admin_port', default=35357)
 register_str('public_port', default=5000)
 register_str('onready')
 register_str('auth_admin_prefix', default='')
+register_bool('standard-threads', default=False)
 
 #ssl options
 register_bool('enable', group='ssl', default=False)