summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorLiem Nguyen <liem.m.nguyen@gmail.com>2012-05-23 18:05:11 +0000
committerLiem Nguyen <liem.m.nguyen@gmail.com>2012-05-24 17:09:53 +0000
commitf537a8259b56aa3913fc2b59b36ef2509cf9ff6b (patch)
treedbda96b18eb768d0f750ad16e6b9c5c5c8399dcf /bin
parent33d107aa1d3e1aa2c188f9df7338a1e7d97a4ed2 (diff)
downloadkeystone-f537a8259b56aa3913fc2b59b36ef2509cf9ff6b.tar.gz
keystone-f537a8259b56aa3913fc2b59b36ef2509cf9ff6b.tar.xz
keystone-f537a8259b56aa3913fc2b59b36ef2509cf9ff6b.zip
blueprint 2-way-ssl
Implemented bp/2-way-ssl using eventlet-based SSL. Change-Id: I5aeb622aded13b406e01c78a2d8c245543306180
Diffstat (limited to 'bin')
-rwxr-xr-xbin/keystone-all6
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/keystone-all b/bin/keystone-all
index bc4ab4b8..be9f3e93 100755
--- a/bin/keystone-all
+++ b/bin/keystone-all
@@ -28,7 +28,11 @@ CONF = config.CONF
def create_server(conf, name, host, port):
app = deploy.loadapp('config:%s' % conf, name=name)
- return wsgi.Server(app, host=host, port=port)
+ server = wsgi.Server(app, host=host, port=port)
+ if CONF.ssl.enable:
+ server.set_ssl(CONF.ssl.certfile, CONF.ssl.keyfile,
+ CONF.ssl.ca_certs, CONF.ssl.cert_required)
+ return server
def serve(*servers):