Move sahara client installation to lib/sahara
All other projects installs their clients in the same lib file as the main services. Remove sahara-dashboard installation Sahara dashboard is now merged into the Horizon and enabled by default (when data_processing endpoint is available), so, we should stop installing it as separated dashboard. Change-Id: I1f0e93e1dee3d065c4f00d8bf2042bebc8d45a22
This commit is contained in:
Sergey Lukjanov
James E. Blair
parent
a7a2b883b2
commit
a90898d904
|
|
@ -8,17 +8,12 @@ if is_service_enabled sahara; then
|
|||
elif [[ "$1" == "stack" && "$2" == "install" ]]; then
|
||||
echo_summary "Installing sahara"
|
||||
install_sahara
|
||||
install_python_saharaclient
|
||||
cleanup_sahara
|
||||
if is_service_enabled horizon; then
|
||||
install_sahara_dashboard
|
||||
fi
|
||||
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
|
||||
echo_summary "Configuring sahara"
|
||||
configure_sahara
|
||||
create_sahara_accounts
|
||||
if is_service_enabled horizon; then
|
||||
configure_sahara_dashboard
|
||||
fi
|
||||
elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
|
||||
echo_summary "Initializing sahara"
|
||||
start_sahara
|
||||
|
|
@ -26,9 +21,6 @@ if is_service_enabled sahara; then
|
|||
|
||||
if [[ "$1" == "unstack" ]]; then
|
||||
stop_sahara
|
||||
if is_service_enabled horizon; then
|
||||
cleanup_sahara_dashboard
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ "$1" == "clean" ]]; then
|
||||
|
|
|
|||
12
lib/sahara
12
lib/sahara
|
|
@ -7,6 +7,7 @@
|
|||
# ``stack.sh`` calls the entry points in this order:
|
||||
#
|
||||
# install_sahara
|
||||
# install_python_saharaclient
|
||||
# configure_sahara
|
||||
# start_sahara
|
||||
# stop_sahara
|
||||
|
|
@ -24,8 +25,13 @@ set +o xtrace
|
|||
SAHARA_REPO=${SAHARA_REPO:-${GIT_BASE}/openstack/sahara.git}
|
||||
SAHARA_BRANCH=${SAHARA_BRANCH:-master}
|
||||
|
||||
SAHARA_PYTHONCLIENT_REPO=${SAHARA_PYTHONCLIENT_REPO:-${GIT_BASE}/openstack/python-saharaclient.git}
|
||||
SAHARA_PYTHONCLIENT_BRANCH=${SAHARA_PYTHONCLIENT_BRANCH:-master}
|
||||
|
||||
# Set up default directories
|
||||
SAHARA_DIR=$DEST/sahara
|
||||
SAHARA_PYTHONCLIENT_DIR=$DEST/python-saharaclient
|
||||
|
||||
SAHARA_CONF_DIR=${SAHARA_CONF_DIR:-/etc/sahara}
|
||||
SAHARA_CONF_FILE=${SAHARA_CONF_DIR}/sahara.conf
|
||||
|
||||
|
|
@ -154,6 +160,12 @@ function install_sahara {
|
|||
setup_develop $SAHARA_DIR
|
||||
}
|
||||
|
||||
# install_python_saharaclient() - Collect source and prepare
|
||||
function install_python_saharaclient {
|
||||
git_clone $SAHARA_PYTHONCLIENT_REPO $SAHARA_PYTHONCLIENT_DIR $SAHARA_PYTHONCLIENT_BRANCH
|
||||
setup_develop $SAHARA_PYTHONCLIENT_DIR
|
||||
}
|
||||
|
||||
# start_sahara() - Start running processes, including screen
|
||||
function start_sahara {
|
||||
screen_it sahara "cd $SAHARA_DIR && $SAHARA_BIN_DIR/sahara-all --config-file $SAHARA_CONF_FILE"
|
||||
|
|
|
|||
|
|
@ -1,72 +0,0 @@
|
|||
# lib/sahara-dashboard
|
||||
|
||||
# Dependencies:
|
||||
#
|
||||
# - ``functions`` file
|
||||
# - ``DEST``, ``DATA_DIR``, ``STACK_USER`` must be defined
|
||||
# - ``SERVICE_HOST``
|
||||
|
||||
# ``stack.sh`` calls the entry points in this order:
|
||||
#
|
||||
# - install_sahara_dashboard
|
||||
# - configure_sahara_dashboard
|
||||
# - cleanup_sahara_dashboard
|
||||
|
||||
# Save trace setting
|
||||
XTRACE=$(set +o | grep xtrace)
|
||||
set +o xtrace
|
||||
|
||||
source $TOP_DIR/lib/horizon
|
||||
|
||||
# Defaults
|
||||
# --------
|
||||
|
||||
# Set up default repos
|
||||
SAHARA_DASHBOARD_REPO=${SAHARA_DASHBOARD_REPO:-${GIT_BASE}/openstack/sahara-dashboard.git}
|
||||
SAHARA_DASHBOARD_BRANCH=${SAHARA_DASHBOARD_BRANCH:-master}
|
||||
|
||||
SAHARA_PYTHONCLIENT_REPO=${SAHARA_PYTHONCLIENT_REPO:-${GIT_BASE}/openstack/python-saharaclient.git}
|
||||
SAHARA_PYTHONCLIENT_BRANCH=${SAHARA_PYTHONCLIENT_BRANCH:-master}
|
||||
|
||||
# Set up default directories
|
||||
SAHARA_DASHBOARD_DIR=$DEST/sahara-dashboard
|
||||
SAHARA_PYTHONCLIENT_DIR=$DEST/python-saharaclient
|
||||
|
||||
# Functions
|
||||
# ---------
|
||||
|
||||
function configure_sahara_dashboard {
|
||||
|
||||
echo -e "AUTO_ASSIGNMENT_ENABLED = False" >> $HORIZON_DIR/openstack_dashboard/local/local_settings.py
|
||||
echo -e "HORIZON_CONFIG['dashboards'] += ('sahara',)" >> $HORIZON_DIR/openstack_dashboard/settings.py
|
||||
echo -e "INSTALLED_APPS += ('saharadashboard',)" >> $HORIZON_DIR/openstack_dashboard/settings.py
|
||||
|
||||
if is_service_enabled neutron; then
|
||||
echo -e "SAHARA_USE_NEUTRON = True" >> $HORIZON_DIR/openstack_dashboard/local/local_settings.py
|
||||
fi
|
||||
}
|
||||
|
||||
# install_sahara_dashboard() - Collect source and prepare
|
||||
function install_sahara_dashboard {
|
||||
install_python_saharaclient
|
||||
git_clone $SAHARA_DASHBOARD_REPO $SAHARA_DASHBOARD_DIR $SAHARA_DASHBOARD_BRANCH
|
||||
setup_develop $SAHARA_DASHBOARD_DIR
|
||||
}
|
||||
|
||||
function install_python_saharaclient {
|
||||
git_clone $SAHARA_PYTHONCLIENT_REPO $SAHARA_PYTHONCLIENT_DIR $SAHARA_PYTHONCLIENT_BRANCH
|
||||
setup_develop $SAHARA_PYTHONCLIENT_DIR
|
||||
}
|
||||
|
||||
# Cleanup file settings.py from Sahara
|
||||
function cleanup_sahara_dashboard {
|
||||
sed -i '/sahara/d' $HORIZON_DIR/openstack_dashboard/settings.py
|
||||
}
|
||||
|
||||
# Restore xtrace
|
||||
$XTRACE
|
||||
|
||||
# Local variables:
|
||||
# mode: shell-script
|
||||
# End:
|
||||
|
||||
Loading…
Reference in New Issue