1. devstack
  2. Commit a88be173e7feed076054b59079e7b93e4df0445c
Browse code

Add support for django_openstack_auth

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/

(Use setup_install instead)

Change-Id: Ifbd336b83f6b2beb23996b599ec820232c13efdd
Closes-Bug: #1262121
(cherry picked from commit e385d1e0309a4fc5d414277260702a7c0fff6ad0)

Zhenguo Niu authored on 2014/03/12 17:58:12
Showing 4 changed files
AUTHORS
History View file @ a88be17
... ... 
@@ -48,3 +48,4 @@ Vishvananda Ishaya <vishvananda@gmail.com>
48 48 
 Yun Mao <yunmao@gmail.com>
49 49 
 Yong Sheng Gong <gongysh@cn.ibm.com>
50 50 
 Zhongyue Luo <lzyeval@gmail.com>
51 
+Zhenguo Niu <niu.zglinux@gmail.com>
lib/horizon
History View file @ a88be17
... ... 
@@ -29,6 +29,7 @@ set +o xtrace
29 29
30 30 
 # Set up default directories
31 31 
 HORIZON_DIR=$DEST/horizon
32 
+HORIZONAUTH_DIR=$DEST/django_openstack_auth
32 33
33 34 
 # local_settings.py is used to customize Dashboard settings.
34 35 
 # The example file in Horizon repo is used by default.
... ... 
@@ -151,6 +152,12 @@ function init_horizon() {
151 151 
     \" $FILES/apache-horizon.template >$horizon_conf"
152 152 
 }
153 153
154 
+# install_django_openstack_auth() - Collect source and prepare
155 
+function install_django_openstack_auth {
156 
+    git_clone $HORIZONAUTH_REPO $HORIZONAUTH_DIR $HORIZONAUTH_BRANCH
157 
+    setup_install $HORIZONAUTH_DIR
158 
+}
159 
+
154 160 
 # install_horizon() - Collect source and prepare
155 161 
 function install_horizon() {
156 162 
     # Apache installation, because we mark it NOPRIME
stack.sh
History View file @ a88be17
... ... 
@@ -689,6 +689,8 @@ if is_service_enabled n-spice; then
689 689 
 fi
690 690
691 691 
 if is_service_enabled horizon; then
692 
+    # django openstack_auth
693 
+    install_django_openstack_auth
692 694 
     # dashboard
693 695 
     install_horizon
694 696 
     configure_horizon
stackrc
History View file @ a88be17
... ... 
@@ -103,6 +103,10 @@ HEATCLIENT_BRANCH=${HEATCLIENT_BRANCH:-master}
103 103 
 HORIZON_REPO=${HORIZON_REPO:-${GIT_BASE}/openstack/horizon.git}
104 104 
 HORIZON_BRANCH=${HORIZON_BRANCH:-stable/havana}
105 105
106 
+# django openstack_auth library
107 
+HORIZONAUTH_REPO=${HORIZONAUTH_REPO:-${GIT_BASE}/openstack/django_openstack_auth.git}
108 
+HORIZONAUTH_BRANCH=${HORIZONAUTH_BRANCH:-master}
109 
+
106 110 
 # baremetal provisionint service
107 111 
 IRONIC_REPO=${IRONIC_REPO:-${GIT_BASE}/openstack/ironic.git}
108 112 
 IRONIC_BRANCH=${IRONIC_BRANCH:-master}