From f18b2979ac3fb366b4385cdc28c025a127372554 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Wed, 25 May 2016 12:18:58 +0100 Subject: [PATCH] Remove tuskar-ui element We no longer support or actively develop tuskar-ui, so remove this element Change-Id: I75ef485528425c580cbe5223b830b83de56f9a45 Related-Bug: #1387487 --- elements/tuskar-ui/README.md | 1 - elements/tuskar-ui/element-deps | 2 - .../package-installs-tuskar-ui | 1 - .../tuskar-ui-source-install/101-tuskar-ui | 19 ----- .../post-configure.d/101-tuskar-ui | 81 ------------------- elements/tuskar-ui/pkg-map | 5 -- .../tuskar-ui/source-repository-tuskar-ui | 1 - 7 files changed, 110 deletions(-) delete mode 100644 elements/tuskar-ui/README.md delete mode 100644 elements/tuskar-ui/element-deps delete mode 100644 elements/tuskar-ui/install.d/tuskar-ui-package-install/package-installs-tuskar-ui delete mode 100755 elements/tuskar-ui/install.d/tuskar-ui-source-install/101-tuskar-ui delete mode 100755 elements/tuskar-ui/os-refresh-config/post-configure.d/101-tuskar-ui delete mode 100644 elements/tuskar-ui/pkg-map delete mode 100644 elements/tuskar-ui/source-repository-tuskar-ui diff --git a/elements/tuskar-ui/README.md b/elements/tuskar-ui/README.md deleted file mode 100644 index 5d68726ef..000000000 --- a/elements/tuskar-ui/README.md +++ /dev/null @@ -1 +0,0 @@ -Install and configure the Tuskar-UI on top of OpenStack Dashboard (Horizon). diff --git a/elements/tuskar-ui/element-deps b/elements/tuskar-ui/element-deps deleted file mode 100644 index 179584c14..000000000 --- a/elements/tuskar-ui/element-deps +++ /dev/null @@ -1,2 +0,0 @@ -horizon -package-installs diff --git a/elements/tuskar-ui/install.d/tuskar-ui-package-install/package-installs-tuskar-ui b/elements/tuskar-ui/install.d/tuskar-ui-package-install/package-installs-tuskar-ui deleted file mode 100644 index ce541f48f..000000000 --- a/elements/tuskar-ui/install.d/tuskar-ui-package-install/package-installs-tuskar-ui +++ /dev/null @@ -1 +0,0 @@ -tuskar_ui_package diff --git a/elements/tuskar-ui/install.d/tuskar-ui-source-install/101-tuskar-ui b/elements/tuskar-ui/install.d/tuskar-ui-source-install/101-tuskar-ui deleted file mode 100755 index c157a1c25..000000000 --- a/elements/tuskar-ui/install.d/tuskar-ui-source-install/101-tuskar-ui +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -set -eu -set -o pipefail - -set +u -source $HORIZON_VENV_DIR/bin/activate -set -u - -pip install -r /opt/stack/tuskar-ui/requirements.txt -pip install -e /opt/stack/tuskar-ui - -set +u -deactivate -set -u - -cp /opt/stack/tuskar-ui/_50_tuskar.py.example $HORIZON_VENV_DIR/lib/python2.7/site-packages/openstack_dashboard/local/enabled/_50_tuskar.py -cp /opt/stack/tuskar-ui/_10_admin.py.example $HORIZON_VENV_DIR/lib/python2.7/site-packages/openstack_dashboard/local/enabled/_10_admin.py -cp /opt/stack/tuskar-ui/_20_project.py.example $HORIZON_VENV_DIR/lib/python2.7/site-packages/openstack_dashboard/local/enabled/_20_project.py -cp /opt/stack/tuskar-ui/_30_identity.py.example $HORIZON_VENV_DIR/lib/python2.7/site-packages/openstack_dashboard/local/enabled/_30_identity.py diff --git a/elements/tuskar-ui/os-refresh-config/post-configure.d/101-tuskar-ui b/elements/tuskar-ui/os-refresh-config/post-configure.d/101-tuskar-ui deleted file mode 100755 index 1baa21c38..000000000 --- a/elements/tuskar-ui/os-refresh-config/post-configure.d/101-tuskar-ui +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/bash -set -eu -set -o pipefail - -if [ -n "${HORIZON_VENV_DIR:-}" ]; then - set +u - source $HORIZON_VENV_DIR/bin/activate - set -u - LOCAL_SETTINGS_FILE=$HORIZON_VENV_DIR/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py - DJANGO_ADMIN=django-admin.py -else - export PYTHONPATH=/usr/share/openstack-dashboard - LOCAL_SETTINGS_FILE=/etc/horizon/local_settings.py - DJANGO_ADMIN=django-admin - cp $LOCAL_SETTINGS_FILE /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py - sed -i 's#^STATIC_ROOT.*#STATIC_ROOT = "'/usr/share/openstack-dashboard/static'"#' /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py -fi - -source /root/stackrc - -# Test tuskar-api and wait for it to start up -export TUSKAR_API_TEST=$(curl localhost:8585) -if [ ! -n "$TUSKAR_API_TEST" ]; then - echo "Waiting 5 second for tuskar-api to start"; - sleep 5; -fi - -if [ -z "$(tuskar --tuskar-api-version 2 plan-list | grep overcloud)" ]; then - COMPUTE_IMAGE_ID=$( glance image-show overcloud-compute | grep id | awk '$2=="id" {print $4}' ) - CONTROL_IMAGE_ID=$( glance image-show overcloud-control | grep id | awk '$2=="id" {print $4}' ) - COMPUTE_ROLE_ID=$( tuskar --tuskar-api-version 2 role-list | awk '$4=="compute" {print $2}' ) - CONTROL_ROLE_ID=$( tuskar --tuskar-api-version 2 role-list | awk '$4=="controller" {print $2}' ) - - PLAN_ID=$( tuskar --tuskar-api-version 2 plan-create overcloud | awk '$2=="uuid" {print $4}' ) - - tuskar --tuskar-api-version 2 plan-add-role -r $COMPUTE_ROLE_ID $PLAN_ID - tuskar --tuskar-api-version 2 plan-add-role -r $CONTROL_ROLE_ID $PLAN_ID - - if [ -n "$(tuskar --tuskar-api-version 2 role-list | grep cinder-storage)" ]; then - BLOCK_STORAGE_IMAGE_ID=$(glance image-show overcloud-cinder-volume | grep id | awk '$2=="id" {print $4}' ) - BLOCK_STORAGE_ROLE_ID=$(tuskar --tuskar-api-version 2 role-list | awk '$4=="cinder-storage" {print $2}') - tuskar --tuskar-api-version 2 plan-add-role -r $BLOCK_STORAGE_ROLE_ID $PLAN_ID - tuskar --tuskar-api-version 2 plan-patch -A cinder-storage-1::Image=$BLOCK_STORAGE_IMAGE_ID $PLAN_ID - fi - - if [ -n "$(tuskar --tuskar-api-version 2 role-list | grep swift-storage)" ]; then - OBJECT_STORAGE_IMAGE_ID=$(glance image-show overcloud-swift-storage | grep id | awk '$2=="id" {print $4}' ) - OBJECT_STORAGE_ROLE_ID=$(tuskar --tuskar-api-version 2 role-list | awk '$4=="swift-storage" {print $2}') - tuskar --tuskar-api-version 2 plan-add-role -r $OBJECT_STORAGE_ROLE_ID $PLAN_ID - tuskar --tuskar-api-version 2 plan-patch -A swift-storage-1::Image=$OBJECT_STORAGE_IMAGE_ID $PLAN_ID - fi - - tuskar --tuskar-api-version 2 plan-patch -A compute-1::Image=$COMPUTE_IMAGE_ID $PLAN_ID - tuskar --tuskar-api-version 2 plan-patch -A controller-1::Image=$CONTROL_IMAGE_ID $PLAN_ID -fi - -if [ -z "$(grep UNDERCLOUD_ADMIN_PASSWORD $LOCAL_SETTINGS_FILE)" ]; then - echo "UNDERCLOUD_ADMIN_PASSWORD = \"${OS_PASSWORD}\"" >> $LOCAL_SETTINGS_FILE -fi -if [ -z "$(grep IRONIC_DISCOVERD_URL $LOCAL_SETTINGS_FILE)" ]; then - echo "IRONIC_DISCOVERD_URL = \"http://127.0.0.1:5050\"" >> $LOCAL_SETTINGS_FILE -fi -if [ -z "$(grep DEPLOYMENT_MODE $LOCAL_SETTINGS_FILE)" ]; then - DEPLOYMENT_MODE=$(os-apply-config --key deployment-mode --key-default=scale) - echo "DEPLOYMENT_MODE = \"${DEPLOYMENT_MODE}\"" >> $LOCAL_SETTINGS_FILE -fi - -DJANGO_SETTINGS_MODULE=openstack_dashboard.settings $DJANGO_ADMIN collectstatic --noinput -DJANGO_SETTINGS_MODULE=openstack_dashboard.settings $DJANGO_ADMIN compress --force - -if [ -n "${HORIZON_VENV_DIR:-}" ]; then - set +u - deactivate - set -u -else - cp $LOCAL_SETTINGS_FILE /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py - sed -i 's#^STATIC_ROOT.*#STATIC_ROOT = "'/usr/share/openstack-dashboard/static'"#' /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py -fi - -os-svc-enable -n apache2 -os-svc-restart -n apache2 diff --git a/elements/tuskar-ui/pkg-map b/elements/tuskar-ui/pkg-map deleted file mode 100644 index 2ead60603..000000000 --- a/elements/tuskar-ui/pkg-map +++ /dev/null @@ -1,5 +0,0 @@ -{ - "default": { - "tuskar_ui_package": "openstack-tuskar-ui" - } -} diff --git a/elements/tuskar-ui/source-repository-tuskar-ui b/elements/tuskar-ui/source-repository-tuskar-ui deleted file mode 100644 index 511e9ecb5..000000000 --- a/elements/tuskar-ui/source-repository-tuskar-ui +++ /dev/null @@ -1 +0,0 @@ -tuskar-ui git /opt/stack/tuskar-ui https://git.openstack.org/openstack/tuskar-ui