| ... | ... |
@@ -26,9 +26,6 @@ set +o xtrace |
| 26 | 26 |
# Defaults |
| 27 | 27 |
# -------- |
| 28 | 28 |
|
| 29 |
-# Set up default directories |
|
| 30 |
-GITDIR["django_openstack_auth"]=$DEST/django_openstack_auth |
|
| 31 |
- |
|
| 32 | 29 |
HORIZON_DIR=$DEST/horizon |
| 33 | 30 |
|
| 34 | 31 |
# local_settings.py is used to customize Dashboard settings. |
| ... | ... |
@@ -159,20 +156,6 @@ function init_horizon {
|
| 159 | 159 |
|
| 160 | 160 |
} |
| 161 | 161 |
|
| 162 |
-# install_django_openstack_auth() - Collect source and prepare |
|
| 163 |
-function install_django_openstack_auth {
|
|
| 164 |
- if use_library_from_git "django_openstack_auth"; then |
|
| 165 |
- local dir=${GITDIR["django_openstack_auth"]}
|
|
| 166 |
- git_clone_by_name "django_openstack_auth" |
|
| 167 |
- # Compile message catalogs before installation |
|
| 168 |
- _prepare_message_catalog_compilation |
|
| 169 |
- (cd $dir; $PYTHON setup.py compile_catalog) |
|
| 170 |
- setup_dev_lib "django_openstack_auth" |
|
| 171 |
- fi |
|
| 172 |
- # if we aren't using this library from git, then we just let it |
|
| 173 |
- # get dragged in by the horizon setup. |
|
| 174 |
-} |
|
| 175 |
- |
|
| 176 | 162 |
# install_horizon() - Collect source and prepare |
| 177 | 163 |
function install_horizon {
|
| 178 | 164 |
# Apache installation, because we mark it NOPRIME |
| ... | ... |
@@ -191,13 +174,6 @@ function stop_horizon {
|
| 191 | 191 |
stop_apache_server |
| 192 | 192 |
} |
| 193 | 193 |
|
| 194 |
-# NOTE: It can be moved to common functions, but it is only used by compilation |
|
| 195 |
-# of django_openstack_auth catalogs at the moment. |
|
| 196 |
-function _prepare_message_catalog_compilation {
|
|
| 197 |
- pip_install_gr Babel |
|
| 198 |
-} |
|
| 199 |
- |
|
| 200 |
- |
|
| 201 | 194 |
# Restore xtrace |
| 202 | 195 |
$_XTRACE_HORIZON |
| 203 | 196 |
|
| ... | ... |
@@ -500,10 +500,6 @@ GITBRANCH["cursive"]=${CURSIVE_BRANCH:-master}
|
| 500 | 500 |
GITREPO["glance_store"]=${GLANCE_STORE_REPO:-${GIT_BASE}/openstack/glance_store.git}
|
| 501 | 501 |
GITBRANCH["glance_store"]=${GLANCE_STORE_BRANCH:-master}
|
| 502 | 502 |
|
| 503 |
-# django openstack_auth library |
|
| 504 |
-GITREPO["django_openstack_auth"]=${HORIZONAUTH_REPO:-${GIT_BASE}/openstack/django_openstack_auth.git}
|
|
| 505 |
-GITBRANCH["django_openstack_auth"]=${HORIZONAUTH_BRANCH:-master}
|
|
| 506 |
- |
|
| 507 | 503 |
# keystone middleware |
| 508 | 504 |
GITREPO["keystonemiddleware"]=${KEYSTONEMIDDLEWARE_REPO:-${GIT_BASE}/openstack/keystonemiddleware.git}
|
| 509 | 505 |
GITBRANCH["keystonemiddleware"]=${KEYSTONEMIDDLEWARE_BRANCH:-master}
|
| ... | ... |
@@ -35,7 +35,7 @@ ALL_LIBS+=" python-glanceclient python-ironicclient" |
| 35 | 35 |
ALL_LIBS+=" oslo.messaging oslo.log cliff stevedore" |
| 36 | 36 |
ALL_LIBS+=" python-cinderclient glance_store oslo.concurrency oslo.db" |
| 37 | 37 |
ALL_LIBS+=" oslo.versionedobjects oslo.vmware keystonemiddleware" |
| 38 |
-ALL_LIBS+=" oslo.serialization django_openstack_auth" |
|
| 38 |
+ALL_LIBS+=" oslo.serialization" |
|
| 39 | 39 |
ALL_LIBS+=" python-openstackclient osc-lib osc-placement" |
| 40 | 40 |
ALL_LIBS+=" os-client-config oslo.rootwrap" |
| 41 | 41 |
ALL_LIBS+=" oslo.i18n oslo.utils python-openstacksdk python-swiftclient" |