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 95f35efd1eebfa38bb6f24f7e2b872167c530142..c43e8f6ef0cd715b80017b545d25af5b2a4cb43f 100755 (executable)
--- 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 cb9bb8abcbcb9db1b481e0035ed79cb32895529d..8288c2294e152ab92ee76711ef4cf04fe34fbd22 100755 (executable)
--- 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)