From 351173624c4a3e24aa479c6ce5f557732bff40e7 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Mon, 17 Feb 2014 18:38:07 +0400 Subject: [PATCH] Improve savanna-dashboard installation * split configurations setting to one-per-line; * don't set SAVANNA_URL in horizon configs - we're now using endpoits keystone to find corresponding edpoint. Change-Id: I9497a511656a2f70e923b651c66c5ef2917a0939 --- lib/savanna-dashboard | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/savanna-dashboard b/lib/savanna-dashboard index 7713a78637..691b23f6e8 100644 --- a/lib/savanna-dashboard +++ b/lib/savanna-dashboard @@ -37,8 +37,9 @@ SAVANNA_PYTHONCLIENT_DIR=$DEST/python-savannaclient function configure_savanna_dashboard() { - echo -e "SAVANNA_URL = \"http://$SERVICE_HOST:8386/v1.1\"\nAUTO_ASSIGNMENT_ENABLED = False" >> $HORIZON_DIR/openstack_dashboard/local/local_settings.py - echo -e "HORIZON_CONFIG['dashboards'] += ('savanna',)\nINSTALLED_APPS += ('savannadashboard',)" >> $HORIZON_DIR/openstack_dashboard/settings.py + echo -e "AUTO_ASSIGNMENT_ENABLED = False" >> $HORIZON_DIR/openstack_dashboard/local/local_settings.py + echo -e "HORIZON_CONFIG['dashboards'] += ('savanna',)" >> $HORIZON_DIR/openstack_dashboard/settings.py + echo -e "INSTALLED_APPS += ('savannadashboard',)" >> $HORIZON_DIR/openstack_dashboard/settings.py if is_service_enabled neutron; then echo -e "SAVANNA_USE_NEUTRON = True" >> $HORIZON_DIR/openstack_dashboard/local/local_settings.py