openstack/cue
Code Issues Proposed changes

changes to install cue-dashboard in devstack

Browse Source 
Change-Id: Id0c3ed72b36f197428a7e286746a027d842dec62
This commit is contained in:
Min Pae 2015-03-19 13:59:52 -07:00
parent dbb3cccf75
commit c7f978cca7
4 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/devstack/extras.d/70-cue.sh
View File

@ -13,6 +13,9 @@ if is_service_enabled cue; then
echo_summary "Installing Cue Client"
install_cueclient
echo_summary "Installing Cue Dashboard"
install_cuedashboard
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
echo_summary "Configuring Cue"
configure_cue

23
contrib/devstack/lib/cue
View File

@ -29,11 +29,14 @@ CUE_REPO=${CUE_REPO:-${GIT_BASE}/stackforge/cue.git}
CUE_BRANCH=${CUE_BRANCH:-master}
CUECLIENT_REPO=${CUECLIENT_REPO:-${GIT_BASE}/stackforge/python-cueclient.git}
CUECLIENT_BRANCH=${CUECLIENT_BRANCH:-master}
CUEDASHBOARD_REPO=${CUECLIENT_REPO:-${GIT_BASE}/stackforge/cue-dashboard.git}
CUEDASHBOARD_BRANCH=${CUECLIENT_BRANCH:-master}
# Set up default paths
CUE_BIN_DIR=$(get_python_exec_prefix)
CUE_DIR=$DEST/cue
CUECLIENT_DIR=$DEST/python-cueclient
CUEDASHBOARD_DIR=$DEST/cue-dashboard
CUE_CONF_DIR=/etc/cue
CUE_STATE_PATH=${CUE_STATE_PATH:=$DATA_DIR/cue}
CUE_CONF=$CUE_CONF_DIR/cue.conf
@ -220,10 +223,6 @@ function init_cue {
function install_cue {
git_clone $CUE_REPO $CUE_DIR $CUE_BRANCH
setup_develop $CUE_DIR
if is_service_enabled horizon; then
echo "Not implemented yet..."
fi
}
# install_cueclient - Collect source and prepare
@ -232,6 +231,22 @@ function install_cueclient {
setup_develop $CUECLIENT_DIR
}
# install_cuedashboard - Collect source and prepare
function install_cuedashboard {
if is_service_enabled horizon; then
git_clone $CUEDASHBOARD_REPO $CUEDASHBOARD_DIR $CUEDASHBOARD_BRANCH
setup_develop $CUEDASHBOARD_DIR
if ! [ -f $DEST/horizon/openstack_dashboard/local/enabled/_70_0_cue_panel_group.py ]; then
ln -s $DEST/cue-dashboard/_70_0_cue_panel_group.py $DEST/horizon/openstack_dashboard/local/enabled/_70_0_cue_panel_group.py
fi
if ! [ -f $DEST/horizon/openstack_dashboard/local/enabled/_70_cue_panel.py ]; then
ln -s $DEST/cue-dashboard/_70_cue_panel.py $DEST/horizon/openstack_dashboard/local/enabled/_70_cue_panel.py
fi
fi
}
# start_cue - Start running processes, including screen
function start_cue {
run_process cue-api "$CUE_BIN_DIR/cue-api --config-file $CUE_CONF"

4
contrib/vagrant/Vagrantfile vendored
View File

@ -55,6 +55,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.synced_folder "../../../python-cueclient", "/home/vagrant/python-cueclient"
end
if File.directory?("../../../cue-dashboard")
config.vm.synced_folder "../../../cue-dashboard", "/home/vagrant/cue-dashboard"
end
config.ssh.shell = "bash -c 'BASH_ENV=/etc/profile exec bash'"
config.vm.define "ubuntu" do |ubuntu|

6
contrib/vagrant/lib/devstack_script.rb
View File

@ -20,10 +20,14 @@ cat << EOF > /home/vagrant/bin/refresh_devstack.sh
#!/bin/bash
rsync -av --exclude='.tox' --exclude='.venv' --exclude='.vagrant' /home/vagrant/cue /opt/stack
if [ -f "/home/vagrant/python-cueclient" ]; then
if [ -d "/home/vagrant/python-cueclient" ]; then
rsync -av --exclude='.tox' --exclude='.venv' --exclude='.vagrant' --exclude='contrib/vagrant' /home/vagrant/python-cueclient /opt/stack
fi
if [ -d "/home/vagrant/cue-dashboard" ]; then
rsync -av --exclude='.tox' --exclude='.venv' --exclude='.vagrant' --exclude='contrib/vagrant' /home/vagrant/cue-dashboard /opt/stack
fi
# Install Vagrant local.conf sample
if [ ! -f "/home/vagrant/devstack/local.conf" ]; then
cp /opt/stack/cue/contrib/devstack/local.conf /home/vagrant/devstack/local.conf