2ecc1f7601
This patch does the following: - updates the Master SHAs for new development work. - includes updates to policy, paste and rootwrap files as required - moves the Aodh repository to openstack_services as it now has implemented a stable branch - Updated the keystone-wsgi file as it was still running the code from liberty - add 2 package requirements to keystone which must be present for the new wsgi file. - updates tempest.conf.j2 to replace ssh_auth_method with auth_method, and change auth_method to 'keypair' (configured is no longer an a valid option) Change-Id: I933c24c03518865d9d40519dafb2ba46769a5453 Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
49 lines
1.5 KiB
Django/Jinja
49 lines
1.5 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
|
|
|
|
{% if keystone_venv_enabled | bool %}
|
|
activate_this = os.path.expanduser("{{ keystone_venv_bin }}/activate_this.py")
|
|
execfile(activate_this, dict(__file__=activate_this))
|
|
{% endif %}
|
|
|
|
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.')
|
|
)
|
|
|
|
# NOTE(ldbragst): 'application' is required in this context by WSGI spec.
|
|
# The following is a reference to Python Paste Deploy documentation
|
|
# http://pythonpaste.org/deploy/
|
|
application = wsgi_server.initialize_application(
|
|
name,
|
|
post_log_configured_function=deprecation_warning)
|