Browse code

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

Sergey Lukjanov authored on 2014/02/17 23:38:07
Showing 1 changed files
... ...
@@ -37,8 +37,9 @@ SAVANNA_PYTHONCLIENT_DIR=$DEST/python-savannaclient
37 37
 
38 38
 function configure_savanna_dashboard() {
39 39
 
40
-    echo -e "SAVANNA_URL = \"http://$SERVICE_HOST:8386/v1.1\"\nAUTO_ASSIGNMENT_ENABLED = False" >> $HORIZON_DIR/openstack_dashboard/local/local_settings.py
41
-    echo -e "HORIZON_CONFIG['dashboards'] += ('savanna',)\nINSTALLED_APPS += ('savannadashboard',)" >> $HORIZON_DIR/openstack_dashboard/settings.py
40
+    echo -e "AUTO_ASSIGNMENT_ENABLED = False" >> $HORIZON_DIR/openstack_dashboard/local/local_settings.py
41
+    echo -e "HORIZON_CONFIG['dashboards'] += ('savanna',)" >> $HORIZON_DIR/openstack_dashboard/settings.py
42
+    echo -e "INSTALLED_APPS += ('savannadashboard',)" >> $HORIZON_DIR/openstack_dashboard/settings.py
42 43
 
43 44
     if is_service_enabled neutron; then
44 45
         echo -e "SAVANNA_USE_NEUTRON = True" >> $HORIZON_DIR/openstack_dashboard/local/local_settings.py