7d01073884
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 openstack_dashboard.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: I0fbb8b9b070d1a0ab5cd55abfcc6587a0cd8957d
24 lines
909 B
Django/Jinja
24 lines
909 B
Django/Jinja
#!{{ horizon_venv_enabled | bool | ternary(horizon_venv_bin + "/", "/usr/bin/env ") }}python
|
|
|
|
# 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 sys
|
|
|
|
from django.core.management import execute_from_command_line # noqa
|
|
|
|
if __name__ == "__main__":
|
|
os.environ.setdefault("DJANGO_SETTINGS_MODULE",
|
|
"openstack_dashboard.settings")
|
|
execute_from_command_line(sys.argv)
|