x/broadview-collector
Code Issues Proposed changes

Add broadview-ui to devstack installation

Browse Source 
Change-Id: Ida03a92452da7085f2ba0e3372ae3db528e624d7
This commit is contained in:
Vitaliy Kharechko 2016-04-22 11:34:42 +03:00
parent 8314c341e6
commit 95d47b0e21
2 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
broadview_collector/tests/bst_report.py
View File

@ -19,7 +19,7 @@ import unittest
# Change these to the host and port the collector is listening on # Change these to the host and port the collector is listening on
host = "10.14.245.57" host = "10.14.244.207"
port = 8082 port = 8082
''' '''

50
devstack/plugin.sh
View File

@ -56,6 +56,10 @@ function install_broadview_collector {
install_broadview_lib install_broadview_lib
install_broadview_collector_python install_broadview_collector_python
if is_service_enabled horizon; then
install_broadview_collector_horizon_ui
fi
} }
function post_config_broadview_collector { function post_config_broadview_collector {
@ -72,12 +76,11 @@ function clean_broadview_collector {
unstack_broadview_collector unstack_broadview_collector
# XXX this comnes later... if is_service_enabled horizon; then
# if is_service_enabled horizon; then
# clean_broadview_horizon_ui
# clean_broadview_horizon_ui
# fi
# fi
clean_broadview_collector_python clean_broadview_collector_python
@ -133,6 +136,9 @@ function install_broadview_lib {
BROADVIEW_LIB_SRC_DIST=$(ls -td /opt/broadview-lib/dist/broadview-lib-*.tar.gz) BROADVIEW_LIB_SRC_DIST=$(ls -td /opt/broadview-lib/dist/broadview-lib-*.tar.gz)
pip_install $BROADVIEW_LIB_SRC_DIST pip_install $BROADVIEW_LIB_SRC_DIST
sudo cp /opt/broadview-lib/broadview_lib/tools/bv-bstctl.py /usr/local/bin
sudo chown $STACK_USER:broadview_collector /usr/local/bin/bv-bstctl.py
sudo chmod 755 /usr/local/bin/bv-bstctl.py
} }
function clean_broadview_lib { function clean_broadview_lib {
@ -167,7 +173,9 @@ function install_broadview_collector_python {
sudo chmod 0755 /var/log/broadview-collector sudo chmod 0755 /var/log/broadview-collector
sudo cp -f "${BROADVIEW_COLLECTOR_BASE}"/broadview-collector/broadview_collector/config/broadviewcollector.conf /etc/broadviewcollector.conf if [[ ! -f /etc/broadviewcollector.conf ]]; then
sudo cp -f "${BROADVIEW_COLLECTOR_BASE}"/broadview-collector/broadview_collector/config/broadviewcollector.conf /etc/broadviewcollector.conf
fi
sudo chown root:broadview_collector /etc/broadviewcollector.conf sudo chown root:broadview_collector /etc/broadviewcollector.conf
@ -209,19 +217,26 @@ function install_broadview_collector_horizon_ui {
echo_summary "Install BroadView Collector Horizon UI" echo_summary "Install BroadView Collector Horizon UI"
sudo mkdir -p /opt/broadview_collector-horizon-ui || true sudo mkdir -p "${BROADVIEW_COLLECTOR_BASE}"/broadview_collector-horizon-ui || true
sudo chown $STACK_USER:broadview_collector /opt/broadview_collector-horizon-ui sudo chown $STACK_USER:broadview_collector "${BROADVIEW_COLLECTOR_BASE}"/broadview_collector-horizon-ui
(cd /opt/broadview_collector-horizon-ui ; virtualenv .) if [[ ! -d "${BROADVIEW_COLLECTOR_BASE}"/broadview_collector-horizon-ui/broadview-ui ]]; then
(cd /opt/broadview_collector-horizon-ui ; sudo -H ./bin/pip install broadview_collector-ui) sudo git clone https://git.openstack.org/openstack/broadview-ui.git "${BROADVIEW_COLLECTOR_BASE}"/broadview_collector-horizon-ui/broadview-ui
fi
sudo ln -sf /opt/broadview_collector-horizon-ui/lib/python2.7/site-packages/monitoring/enabled/_50_admin_add_monitoring_panel.py "${BROADVIEW_COLLECTOR_BASE}"/horizon/openstack_dashboard/local/enabled/_50_admin_add_monitoring_panel.py if [[ ! -f /etc/broadviewswitches.conf ]]; then
sudo cp "${BROADVIEW_COLLECTOR_BASE}"/broadview_collector-horizon-ui/broadview-ui/broadview/config/broadviewswitches.conf /etc/broadviewswitches.conf
sudo chown $STACK_USER:broadview_collector /etc/broadviewswitches.conf
fi
sudo ln -sf /opt/broadview_collector-horizon-ui/lib/python2.7/site-packages/monitoring/static/monitoring "${BROADVIEW_COLLECTOR_BASE}"/horizon/monitoring sudo cp "${BROADVIEW_COLLECTOR_BASE}"/broadview_collector-horizon-ui/broadview-ui/_50_broadview.py "${BROADVIEW_COLLECTOR_BASE}"/horizon/openstack_dashboard/enabled/
sudo chown $STACK_USER:broadview_collector "${BROADVIEW_COLLECTOR_BASE}"/horizon/openstack_dashboard/enabled/_50_broadview.py
sudo PYTHONPATH=/opt/broadview_collector-horizon-ui/lib/python2.7/site-packages python "${BROADVIEW_COLLECTOR_BASE}"/horizon/manage.py compress --force sudo cp -r "${BROADVIEW_COLLECTOR_BASE}"/broadview_collector-horizon-ui/broadview-ui/broadview "${BROADVIEW_COLLECTOR_BASE}"/horizon/openstack_dashboard/dashboards
sudo chown -R $STACK_USER:broadview_collector "${BROADVIEW_COLLECTOR_BASE}"/horizon/openstack_dashboard/dashboards/broadview
sudo service apache2 restart sudo service apache2 restart
@ -235,12 +250,11 @@ function clean_broadview_collector_horizon_ui {
echo_summary "Clean BroadView Collector Horizon UI" echo_summary "Clean BroadView Collector Horizon UI"
sudo rm -f "${BROADVIEW_COLLECTOR_BASE}"/horizon/openstack_dashboard/local/enabled/_50_admin_add_monitoring_panel.py sudo rm -f "${BROADVIEW_COLLECTOR_BASE}"/horizon/openstack_dashboard/enabled/_50_broadview.py
sudo rm -f "${BROADVIEW_COLLECTOR_BASE}"/horizon/monitoring sudo rm -rf "${BROADVIEW_COLLECTOR_BASE}"/horizon/openstack_dashboard/dashboards/broadview
sudo rm -rf /opt/broadview_collector-horizon-ui
sudo rm -rf "${BROADVIEW_COLLECTOR_BASE}"/broadview_collector-horizon-ui
} }
# Allows this script to be called directly outside of # Allows this script to be called directly outside of