openstack/devstack
Code Issues Proposed changes

support installing django_openstack_auth from pypi

Browse Source 
Part of the libs from pypi conversion, convert django_openstack_auth
to this format.

Change-Id: I97c8ea19d8aed1e0bdd62c06cfadd1d616573d76
This commit is contained in:
Sean Dague 2014-11-14 09:31:02 -05:00
parent c98ae29aa9
commit 3c8973a90a
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/horizon
View File

@ -25,8 +25,9 @@ set +o xtrace
# -------- # --------
# Set up default directories # Set up default directories
GITDIR["django_openstack_auth"]=$DEST/django_openstack_auth
HORIZON_DIR=$DEST/horizon HORIZON_DIR=$DEST/horizon
HORIZONAUTH_DIR=$DEST/django_openstack_auth
# local_settings.py is used to customize Dashboard settings. # local_settings.py is used to customize Dashboard settings.
# The example file in Horizon repo is used by default. # The example file in Horizon repo is used by default.
@ -89,9 +90,7 @@ function configure_horizon {
# Horizon is installed as develop mode, so we can compile here. # Horizon is installed as develop mode, so we can compile here.
# Message catalog compilation is handled by Django admin script, # Message catalog compilation is handled by Django admin script,
# so compiling them after the installation avoids Django installation twice. # so compiling them after the installation avoids Django installation twice.
cd $HORIZON_DIR (cd $HORIZON_DIR; ./run_tests.sh -N --compilemessages)
./run_tests.sh -N --compilemessages
cd -
} }
# init_horizon() - Initialize databases, etc. # init_horizon() - Initialize databases, etc.
@ -145,15 +144,16 @@ function init_horizon {
# install_django_openstack_auth() - Collect source and prepare # install_django_openstack_auth() - Collect source and prepare
function install_django_openstack_auth { function install_django_openstack_auth {
git_clone $HORIZONAUTH_REPO $HORIZONAUTH_DIR $HORIZONAUTH_BRANCH if use_library_from_git "django_openstack_auth"; then
local dir=${GITDIR["django_openstack_auth"]}
# Compile message catalogs before installation git_clone_by_name "django_openstack_auth"
_prepare_message_catalog_compilation # Compile message catalogs before installation
cd $HORIZONAUTH_DIR _prepare_message_catalog_compilation
python setup.py compile_catalog (cd $dir; python setup.py compile_catalog)
cd - setup_dev_lib "django_openstack_auth"
fi
setup_install $HORIZONAUTH_DIR # if we aren't using this library from git, then we just let it
# get dragged in by the horizon setup.
} }
# install_horizon() - Collect source and prepare # install_horizon() - Collect source and prepare

4
stackrc
View File

@ -350,8 +350,8 @@ HEAT_TEMPLATES_REPO=${HEAT_TEMPLATES_REPO:-${GIT_BASE}/openstack/heat-templates.
HEAT_TEMPLATES_BRANCH=${HEAT_TEMPLATES_BRANCH:-master} HEAT_TEMPLATES_BRANCH=${HEAT_TEMPLATES_BRANCH:-master}
# django openstack_auth library # django openstack_auth library
HORIZONAUTH_REPO=${HORIZONAUTH_REPO:-${GIT_BASE}/openstack/django_openstack_auth.git} GITREPO["django_openstack_auth"]=${HORIZONAUTH_REPO:-${GIT_BASE}/openstack/django_openstack_auth.git}
HORIZONAUTH_BRANCH=${HORIZONAUTH_BRANCH:-master} GITBRANCH["django_openstack_auth"]=${HORIZONAUTH_BRANCH:-master}
# keystone middleware # keystone middleware
KEYSTONEMIDDLEWARE_REPO=${KEYSTONEMIDDLEWARE_REPO:-${GIT_BASE}/openstack/keystonemiddleware.git} KEYSTONEMIDDLEWARE_REPO=${KEYSTONEMIDDLEWARE_REPO:-${GIT_BASE}/openstack/keystonemiddleware.git}