openstack/tripleo-image-elements
Code Issues Proposed changes

Merge "Remove tuskar-ui element"

Browse Source
This commit is contained in:
Jenkins 2016-05-30 06:22:37 +00:00 committed by Gerrit Code Review
commit 9e381f509b
7 changed files with 0 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
elements/tuskar-ui/README.md
View File

@ -1 +0,0 @@
Install and configure the Tuskar-UI on top of OpenStack Dashboard (Horizon).

2
elements/tuskar-ui/element-deps
View File

@ -1,2 +0,0 @@
horizon
package-installs

1
elements/tuskar-ui/install.d/tuskar-ui-package-install/package-installs-tuskar-ui
View File

@ -1 +0,0 @@
tuskar_ui_package

19
elements/tuskar-ui/install.d/tuskar-ui-source-install/101-tuskar-ui
View File

@ -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

81
elements/tuskar-ui/os-refresh-config/post-configure.d/101-tuskar-ui
View File

@ -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

5
elements/tuskar-ui/pkg-map
View File

@ -1,5 +0,0 @@
{
"default": {
"tuskar_ui_package": "openstack-tuskar-ui"
}
}

1
elements/tuskar-ui/source-repository-tuskar-ui
View File

@ -1 +0,0 @@
tuskar-ui git /opt/stack/tuskar-ui https://git.openstack.org/openstack/tuskar-ui