Browse code

Merge "Add support for django_openstack_auth" into stable/icehouse

Jenkins authored on 2014/06/24 02:31:31
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.
... ...
@@ -140,6 +141,12 @@ function init_horizon {
140 140
     \" $FILES/apache-horizon.template >$horizon_conf"
141 141
 }
142 142
 
143
+# install_django_openstack_auth() - Collect source and prepare
144
+function install_django_openstack_auth {
145
+    git_clone $HORIZONAUTH_REPO $HORIZONAUTH_DIR $HORIZONAUTH_BRANCH
146
+    setup_install $HORIZONAUTH_DIR
147
+}
148
+
143 149
 # install_horizon() - Collect source and prepare
144 150
 function install_horizon {
145 151
     # Apache installation, because we mark it NOPRIME
... ...
@@ -742,6 +742,8 @@ if is_service_enabled nova; then
742 742
 fi
743 743
 
744 744
 if is_service_enabled horizon; then
745
+    # django openstack_auth
746
+    install_django_openstack_auth
745 747
     # dashboard
746 748
     install_horizon
747 749
     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:-stable/icehouse}
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:-stable/icehouse}