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/

Change-Id: Ifbd336b83f6b2beb23996b599ec820232c13efdd
Closes-Bug: #1262121

Zhenguo Niu authored on 2014/03/12 17:58:12
Showing 4 changed files
... ...
@@ -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>
... ...
@@ -26,6 +26,7 @@ set +o xtrace
26 26
 
27 27
 # Set up default directories
28 28
 HORIZON_DIR=$DEST/horizon
29
+HORIZONAUTH_DIR=$DEST/django_openstack_auth
29 30
 
30 31
 # local_settings.py is used to customize Dashboard settings.
31 32
 # The example file in Horizon repo is used by default.
... ...
@@ -155,6 +156,12 @@ function init_horizon {
155 155
 
156 156
 }
157 157
 
158
+# install_django_openstack_auth() - Collect source and prepare
159
+function install_django_openstack_auth {
160
+    git_clone $HORIZONAUTH_REPO $HORIZONAUTH_DIR $HORIZONAUTH_BRANCH
161
+    setup_develop $HORIZONAUTH_DIR
162
+}
163
+
158 164
 # install_horizon() - Collect source and prepare
159 165
 function install_horizon {
160 166
     # Apache installation, because we mark it NOPRIME
... ...
@@ -757,6 +757,8 @@ if is_service_enabled nova; then
757 757
 fi
758 758
 
759 759
 if is_service_enabled horizon; then
760
+    # django openstack_auth
761
+    install_django_openstack_auth
760 762
     # dashboard
761 763
     install_horizon
762 764
     configure_horizon
... ...
@@ -133,6 +133,10 @@ HEATCLIENT_BRANCH=${HEATCLIENT_BRANCH:-master}
133 133
 HORIZON_REPO=${HORIZON_REPO:-${GIT_BASE}/openstack/horizon.git}
134 134
 HORIZON_BRANCH=${HORIZON_BRANCH:-master}
135 135
 
136
+# django openstack_auth library
137
+HORIZONAUTH_REPO=${HORIZONAUTH_REPO:-${GIT_BASE}/openstack/django_openstack_auth.git}
138
+HORIZONAUTH_BRANCH=${HORIZONAUTH_BRANCH:-master}
139
+
136 140
 # baremetal provisionint service
137 141
 IRONIC_REPO=${IRONIC_REPO:-${GIT_BASE}/openstack/ironic.git}
138 142
 IRONIC_BRANCH=${IRONIC_BRANCH:-master}