Merge "Update devstack plugin to use new repo"
This commit is contained in:
Jenkins
Gerrit Code Review
commit
5d8d5e2af4
|
|
@ -72,7 +72,6 @@ function configure_congress {
|
|||
CONGRESS_DRIVERS+="congress.datasources.swift_driver.SwiftDriver,"
|
||||
CONGRESS_DRIVERS+="congress.datasources.plexxi_driver.PlexxiDriver,"
|
||||
CONGRESS_DRIVERS+="congress.datasources.vCenter_driver.VCenterDriver,"
|
||||
CONGRESS_DRIVERS+="congress.datasources.cloudfoundryv2_driver.CloudFoundryV2Driver,"
|
||||
CONGRESS_DRIVERS+="congress.datasources.murano_driver.MuranoDriver,"
|
||||
CONGRESS_DRIVERS+="congress.datasources.ironic_driver.IronicDriver,"
|
||||
CONGRESS_DRIVERS+="congress.datasources.heatv1_driver.HeatV1Driver,"
|
||||
|
|
@ -86,14 +85,6 @@ function configure_congress {
|
|||
|
||||
_congress_setup_keystone $CONGRESS_CONF keystone_authtoken
|
||||
|
||||
if is_service_enabled horizon; then
|
||||
_congress_setup_horizon
|
||||
fi
|
||||
_congress_setup_third_party_requirements
|
||||
}
|
||||
|
||||
function _congress_setup_third_party_requirements {
|
||||
pip_install -r $CONGRESS_DIR/thirdparty-requirements.txt
|
||||
}
|
||||
|
||||
function configure_congress_datasources {
|
||||
|
|
@ -132,10 +123,12 @@ function create_predefined_policy {
|
|||
fi
|
||||
}
|
||||
|
||||
|
||||
function configure_congressclient {
|
||||
setup_develop $CONGRESSCLIENT_DIR
|
||||
function _install_congress_dashboard {
|
||||
git_clone $CONGRESSDASHBOARD_REPO $CONGRESSDASHBOARD_DIR $CONGRESSDASHBOARD_BRANCH
|
||||
setup_develop $CONGRESSDASHBOARD_DIR
|
||||
_congress_setup_horizon
|
||||
}
|
||||
|
||||
# create_congress_cache_dir() - Part of the _congress_setup_keystone() process
|
||||
function create_congress_cache_dir {
|
||||
# Create cache dir
|
||||
|
|
@ -179,6 +172,10 @@ function install_congress {
|
|||
install_package default-jre
|
||||
git_clone $CONGRESSCLIENT_REPO $CONGRESSCLIENT_DIR $CONGRESSCLIENT_BRANCH
|
||||
setup_develop $CONGRESSCLIENT_DIR
|
||||
|
||||
if is_service_enabled horizon; then
|
||||
_install_congress_dashboard
|
||||
fi
|
||||
}
|
||||
|
||||
# Start running processes, including screen
|
||||
|
|
@ -247,32 +244,9 @@ function _congress_setup_keystone {
|
|||
# Set up Horizon integration with Congress
|
||||
function _congress_setup_horizon {
|
||||
# Dashboard panels
|
||||
cp $CONGRESS_HORIZON_DIR/enabled/_50_policy.py $HORIZON_DIR/openstack_dashboard/local/enabled/
|
||||
cp $CONGRESS_HORIZON_DIR/enabled/_60_policies.py $HORIZON_DIR/openstack_dashboard/local/enabled/
|
||||
cp $CONGRESS_HORIZON_DIR/enabled/_70_datasources.py $HORIZON_DIR/openstack_dashboard/local/enabled/
|
||||
|
||||
# For unit tests
|
||||
echo "python-congressclient" >> $HORIZON_DIR/requirements.txt
|
||||
echo -e \
|
||||
"\n# Load the pluggable dashboard settings"\
|
||||
"\nimport openstack_dashboard.local.enabled"\
|
||||
"\nfrom openstack_dashboard.utils import settings"\
|
||||
"\n\nINSTALLED_APPS = list(INSTALLED_APPS)"\
|
||||
"\nsettings.update_dashboards(["\
|
||||
"\n openstack_dashboard.local.enabled,"\
|
||||
"\n], HORIZON_CONFIG, INSTALLED_APPS)" >> $HORIZON_DIR/openstack_dashboard/test/settings.py
|
||||
|
||||
# Setup alias for django-admin which could be different depending on distro
|
||||
local django_admin
|
||||
if type -p django-admin > /dev/null; then
|
||||
django_admin=django-admin
|
||||
else
|
||||
django_admin=django-admin.py
|
||||
fi
|
||||
|
||||
# Collect and compress static files (e.g., JavaScript, CSS)
|
||||
DJANGO_SETTINGS_MODULE=openstack_dashboard.settings $django_admin collectstatic --noinput
|
||||
DJANGO_SETTINGS_MODULE=openstack_dashboard.settings $django_admin compress --force
|
||||
ln -fs $CONGRESSDASHBOARD_DIR/congress_dashboard/enabled/_50_policy.py $HORIZON_DIR/openstack_dashboard/local/enabled/
|
||||
ln -fs $CONGRESSDASHBOARD_DIR/congress_dashboard/enabled/_60_policies.py $HORIZON_DIR/openstack_dashboard/local/enabled/
|
||||
ln -fs $CONGRESSDASHBOARD_DIR/congress_dashboard/enabled/_70_datasources.py $HORIZON_DIR/openstack_dashboard/local/enabled/
|
||||
|
||||
# Restart Horizon
|
||||
restart_apache_server
|
||||
|
|
@ -287,7 +261,6 @@ if is_service_enabled congress; then
|
|||
install_congress
|
||||
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
|
||||
echo_summary "Configuring Congress"
|
||||
configure_congressclient
|
||||
configure_congress
|
||||
|
||||
if is_service_enabled key; then
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
CONGRESS_DIR=$DEST/congress
|
||||
CONGRESSCLIENT_DIR=$DEST/python-congressclient
|
||||
CONGRESS_AUTH_CACHE_DIR=${CONGRESS_AUTH_CACHE_DIR:-/var/cache/congress}
|
||||
CONGRESS_HORIZON_DIR=$CONGRESS_DIR/congress_dashboard
|
||||
CONGRESSDASHBOARD_DIR=$DEST/congress-dashboard
|
||||
|
||||
# Support entry points installation of console scripts
|
||||
if [[ -d $CONGRESS_DIR/bin/congress-server ]]; then
|
||||
|
|
@ -50,5 +50,8 @@ CONGRESS_BRANCH=${CONGRESS_BRANCH:-master}
|
|||
CONGRESSCLIENT_REPO=${CONGRESSCLIENT_REPO:-${GIT_BASE}/openstack/python-congressclient.git}
|
||||
CONGRESSCLIENT_BRANCH=${CONGRESSCLIENT_BRANCH:-master}
|
||||
|
||||
# congress dashboard
|
||||
CONGRESSDASHBOARD_REPO=${CONGRESSDASHBOARD_REPO:-${GIT_BASE}/openstack/congress-dashboard.git}
|
||||
CONGRESSDASHBOARD_BRANCH=${CONGRESSDASHBOARD_BRANCH:-master}
|
||||
|
||||
enable_service congress congress-api congress-engine congress-datasources
|
||||
|
|
|
|||
Loading…
Reference in New Issue