36486b16b4
This commit uses the pattern established in [1] to remove the venv activation code by using the correct venv Python interpreter instead. Note that using python-path in keystone-httpd.conf.j2 does not achieve full isolation from the host's python installation as we'd hope (the path will still include /usr/local/lib/python2.7/dist-packages and /usr/lib/python2.7/dist-packages), but every attempt at using python-home failed due to the venv interpreter not being able to find argparse. We will need to spend some additional cycles here trying to solve this as locking the venv interpreter into its own site-packages is the best solution long-term. [1] https://review.openstack.org/#/c/273943/ Change-Id: I441d8e488d9396583b4fafd454d14bc3fce20eb1
44 lines
1.6 KiB
Django/Jinja
44 lines
1.6 KiB
Django/Jinja
# Copyright 2013 OpenStack Foundation
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import os
|
|
|
|
import pbr.version
|
|
_version_ = pbr.version.VersionInfo('keystone').version_string()
|
|
|
|
#TODO(cloudnull) This should be removed in the N time frame
|
|
if '8' in _version_:
|
|
from keystone.server import wsgi as wsgi_server
|
|
name = os.path.basename(__file__)
|
|
application = wsgi_server.initialize_application(name)
|
|
else:
|
|
import os
|
|
from oslo_log import log
|
|
from oslo_log import versionutils
|
|
from keystone.i18n import _LW
|
|
from keystone.server import wsgi as wsgi_server
|
|
name = os.path.basename(__file__)
|
|
LOG = log.getLogger(__name__)
|
|
def deprecation_warning():
|
|
versionutils.report_deprecated_feature(
|
|
LOG,
|
|
_LW('httpd/keystone.py is deprecated as of Mitaka'
|
|
' in favor of keystone-wsgi-admin and keystone-wsgi-public'
|
|
' and may be removed in O.')
|
|
)
|
|
application = wsgi_server.initialize_application(
|
|
name,
|
|
post_log_configured_function=deprecation_warning
|
|
)
|