diff --git a/lib/horizon b/lib/horizon index 3d2f68d09d..fab41bbeca 100644 --- a/lib/horizon +++ b/lib/horizon @@ -26,9 +26,6 @@ set +o xtrace # Defaults # -------- -# Set up default directories -GITDIR["django_openstack_auth"]=$DEST/django_openstack_auth - HORIZON_DIR=$DEST/horizon # local_settings.py is used to customize Dashboard settings. @@ -159,20 +156,6 @@ function init_horizon { } -# install_django_openstack_auth() - Collect source and prepare -function install_django_openstack_auth { - if use_library_from_git "django_openstack_auth"; then - local dir=${GITDIR["django_openstack_auth"]} - git_clone_by_name "django_openstack_auth" - # Compile message catalogs before installation - _prepare_message_catalog_compilation - (cd $dir; $PYTHON setup.py compile_catalog) - setup_dev_lib "django_openstack_auth" - fi - # if we aren't using this library from git, then we just let it - # get dragged in by the horizon setup. -} - # install_horizon() - Collect source and prepare function install_horizon { # Apache installation, because we mark it NOPRIME @@ -191,13 +174,6 @@ function stop_horizon { stop_apache_server } -# NOTE: It can be moved to common functions, but it is only used by compilation -# of django_openstack_auth catalogs at the moment. -function _prepare_message_catalog_compilation { - pip_install_gr Babel -} - - # Restore xtrace $_XTRACE_HORIZON diff --git a/stack.sh b/stack.sh index e57ab7b6fc..9b496c0e20 100755 --- a/stack.sh +++ b/stack.sh @@ -911,8 +911,6 @@ if is_service_enabled placement placement-client; then fi if is_service_enabled horizon; then - # django openstack_auth - install_django_openstack_auth # dashboard stack_install_service horizon fi diff --git a/stackrc b/stackrc index 7ed8a67fd7..c243d271b8 100644 --- a/stackrc +++ b/stackrc @@ -500,10 +500,6 @@ GITBRANCH["cursive"]=${CURSIVE_BRANCH:-master} GITREPO["glance_store"]=${GLANCE_STORE_REPO:-${GIT_BASE}/openstack/glance_store.git} GITBRANCH["glance_store"]=${GLANCE_STORE_BRANCH:-master} -# django openstack_auth library -GITREPO["django_openstack_auth"]=${HORIZONAUTH_REPO:-${GIT_BASE}/openstack/django_openstack_auth.git} -GITBRANCH["django_openstack_auth"]=${HORIZONAUTH_BRANCH:-master} - # keystone middleware GITREPO["keystonemiddleware"]=${KEYSTONEMIDDLEWARE_REPO:-${GIT_BASE}/openstack/keystonemiddleware.git} GITBRANCH["keystonemiddleware"]=${KEYSTONEMIDDLEWARE_BRANCH:-master} diff --git a/tests/test_libs_from_pypi.sh b/tests/test_libs_from_pypi.sh index 0bd8d49357..a544b56577 100755 --- a/tests/test_libs_from_pypi.sh +++ b/tests/test_libs_from_pypi.sh @@ -35,7 +35,7 @@ ALL_LIBS+=" python-glanceclient python-ironicclient" ALL_LIBS+=" oslo.messaging oslo.log cliff stevedore" ALL_LIBS+=" python-cinderclient glance_store oslo.concurrency oslo.db" ALL_LIBS+=" oslo.versionedobjects oslo.vmware keystonemiddleware" -ALL_LIBS+=" oslo.serialization django_openstack_auth" +ALL_LIBS+=" oslo.serialization" ALL_LIBS+=" python-openstackclient osc-lib osc-placement" ALL_LIBS+=" os-client-config oslo.rootwrap" ALL_LIBS+=" oslo.i18n oslo.utils python-openstacksdk python-swiftclient"