From: Tomas Sedovic <tomas@sedovic.cz>
Date: Wed, 4 Apr 2012 17:13:37 +0000 (+0200)
Subject: Fix --template-file
X-Git-Tag: 2014.1~2089
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=7690e1b5d4ca5dce2aeccbb04da43871cd8718fc;p=openstack-build%2Fheat-build.git

Fix --template-file

Fixes #47

The code that causes the URI TOO LONG error is in eventlet.wsgi.

So for the time being we're replacing that with paste.httpserver which serves
WSGI apps, too.

Longer term, we want to use eventlet but they need to make the maximum URL
length configurable.
---

diff --git a/bin/heat-api b/bin/heat-api
index 95f35efd..c43e8f6e 100755
--- a/bin/heat-api
+++ b/bin/heat-api
@@ -23,6 +23,7 @@ gettext.install('heat', unicode=1)
 
 from heat.common import config
 from heat.common import wsgi
+from paste import httpserver
 
 
 if __name__ == '__main__':
@@ -34,8 +35,6 @@ if __name__ == '__main__':
 
         port = config.DEFAULT_PORT
         print 'Starting Heat API on port %s' % port
-        server = wsgi.Server()
-        server.start(app, conf, default_port=port)
-        server.wait()
+        httpserver.serve(app, port=port)
     except RuntimeError, e:
         sys.exit("ERROR: %s" % e)
diff --git a/bin/heat-engine b/bin/heat-engine
index cb9bb8ab..8288c229 100755
--- a/bin/heat-engine
+++ b/bin/heat-engine
@@ -36,6 +36,7 @@ gettext.install('heat', unicode=1)
 
 from heat.common import config
 from heat.common import wsgi
+from paste import httpserver
 
 
 if __name__ == '__main__':
@@ -47,8 +48,6 @@ if __name__ == '__main__':
 
         port = config.DEFAULT_PORT+1
         print 'Starting Heat Engine on port %s' % port
-        server = wsgi.Server()
-        server.start(app, conf, default_port=port)
-        server.wait()
+        httpserver.serve(app, port=port)
     except RuntimeError, e:
         sys.exit("ERROR: %s" % e)