openstack/devstack
Code Issues Proposed changes

Add support for django_openstack_auth

Browse Source 
It would be useful for development, reviewing and testing to add
support for django_openstack_auth to devstack.

This change adds the integration tests to the openstack_auth
list of test: https://review.openstack.org/#/c/86528/

Change-Id: Ifbd336b83f6b2beb23996b599ec820232c13efdd
Closes-Bug: #1262121
This commit is contained in:
Zhenguo Niu 2014-03-12 16:58:12 +08:00
parent 5bdabd070b
commit e385d1e030
4 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -48,3 +48,4 @@ Vishvananda Ishaya <vishvananda@gmail.com>
Yun Mao <yunmao@gmail.com> Yun Mao <yunmao@gmail.com>
Yong Sheng Gong <gongysh@cn.ibm.com> Yong Sheng Gong <gongysh@cn.ibm.com>
Zhongyue Luo <lzyeval@gmail.com> Zhongyue Luo <lzyeval@gmail.com>
Zhenguo Niu <niu.zglinux@gmail.com>

7
lib/horizon
View File

@ -26,6 +26,7 @@ set +o xtrace
# Set up default directories # Set up default directories
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.
@ -155,6 +156,12 @@ function init_horizon {
} }
# install_django_openstack_auth() - Collect source and prepare
function install_django_openstack_auth {
git_clone $HORIZONAUTH_REPO $HORIZONAUTH_DIR $HORIZONAUTH_BRANCH
setup_develop $HORIZONAUTH_DIR
}
# install_horizon() - Collect source and prepare # install_horizon() - Collect source and prepare
function install_horizon { function install_horizon {
# Apache installation, because we mark it NOPRIME # Apache installation, because we mark it NOPRIME

2
stack.sh
View File

@ -757,6 +757,8 @@ if is_service_enabled nova; then
fi fi
if is_service_enabled horizon; then if is_service_enabled horizon; then
# django openstack_auth
install_django_openstack_auth
# dashboard # dashboard
install_horizon install_horizon
configure_horizon configure_horizon

4
stackrc
View File

@ -133,6 +133,10 @@ HEATCLIENT_BRANCH=${HEATCLIENT_BRANCH:-master}
HORIZON_REPO=${HORIZON_REPO:-${GIT_BASE}/openstack/horizon.git} HORIZON_REPO=${HORIZON_REPO:-${GIT_BASE}/openstack/horizon.git}
HORIZON_BRANCH=${HORIZON_BRANCH:-master} HORIZON_BRANCH=${HORIZON_BRANCH:-master}
# django openstack_auth library
HORIZONAUTH_REPO=${HORIZONAUTH_REPO:-${GIT_BASE}/openstack/django_openstack_auth.git}
HORIZONAUTH_BRANCH=${HORIZONAUTH_BRANCH:-master}
# baremetal provisionint service # baremetal provisionint service
IRONIC_REPO=${IRONIC_REPO:-${GIT_BASE}/openstack/ironic.git} IRONIC_REPO=${IRONIC_REPO:-${GIT_BASE}/openstack/ironic.git}
IRONIC_BRANCH=${IRONIC_BRANCH:-master} IRONIC_BRANCH=${IRONIC_BRANCH:-master}