diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-05-29 20:17:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-05-29 20:17:33 +0000 |
| commit | 8de61f8af43563b1d93291c868634810d9e42902 (patch) | |
| tree | 58ea09316c53cc70c370115f383ada92b1925807 /bin | |
| parent | 654dd416321972f8666dfad201228a456a8915a2 (diff) | |
| parent | f537a8259b56aa3913fc2b59b36ef2509cf9ff6b (diff) | |
| download | keystone-8de61f8af43563b1d93291c868634810d9e42902.tar.gz keystone-8de61f8af43563b1d93291c868634810d9e42902.tar.xz keystone-8de61f8af43563b1d93291c868634810d9e42902.zip | |
Merge "blueprint 2-way-ssl"
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/keystone-all | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/keystone-all b/bin/keystone-all index d961669c..4767c258 100755 --- a/bin/keystone-all +++ b/bin/keystone-all @@ -29,7 +29,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 sigint_handler(signal, frame): |