openstack/openstack-ansible-os_keystone
Code Issues Proposed changes

We recently added a check when deploying the keystone.wsgi script that would

Browse Source 
allow it to be smart enough to handle the keystone stable/liberty codebase and
master. This change was using 2015 as the keystone version but for
stable/liberty this has changed to 8.

This patch makes it so that the wsgi script matches what PBR gives back
for stable/liberty deployments.
This commit is contained in:
Kevin Carter 2016-02-29 09:41:25 -06:00
parent 7d4cc4a217
commit e18e50edf8
No known key found for this signature in database
GPG Key ID: 69FEFFC5E2D9273F
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/keystone-wsgi.py.j2
View File

@ -23,7 +23,7 @@ import pbr.version
_version_ = pbr.version.VersionInfo('keystone').version_string() _version_ = pbr.version.VersionInfo('keystone').version_string()
#TODO(cloudnull) This should be removed in the N time frame #TODO(cloudnull) This should be removed in the N time frame
if '2015' in _version_: if '8' in _version_:
from keystone.server import wsgi as wsgi_server from keystone.server import wsgi as wsgi_server
name = os.path.basename(__file__) name = os.path.basename(__file__)
application = wsgi_server.initialize_application(name) application = wsgi_server.initialize_application(name)