updating comments, adding fixmes
diff --git a/files/dash_settings.py b/files/dash_settings.py
index 5f54f3d..d467da8 100644
--- a/files/dash_settings.py
+++ b/files/dash_settings.py
@@ -6,6 +6,8 @@
USE_SSL = False
LOCAL_PATH = os.path.dirname(os.path.abspath(__file__))
+
+# FIXME: We need to change this to mysql, instead of sqlite.
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
@@ -43,7 +45,7 @@
# EMAIL_HOST_USER = 'djangomail'
# EMAIL_HOST_PASSWORD = 'top-secret!'
-
+# FIXME: This needs to be changed to allow for multi-node setup.
OPENSTACK_ADMIN_TOKEN = "999888777666"
OPENSTACK_KEYSTONE_URL = "http://localhost:5000/v2.0/"
OPENSTACK_KEYSTONE_DEFAULT_ROLE = "Member"
@@ -53,7 +55,7 @@
SWIFT_ENABLED = False
# Configure quantum connection details for networking
-QUANTUM_ENABLED = True
+QUANTUM_ENABLED = False
QUANTUM_URL = '127.0.0.1'
QUANTUM_PORT = '9696'
QUANTUM_TENANT = '1234'
diff --git a/stack.sh b/stack.sh
index 3d941a6..c250940 100755
--- a/stack.sh
+++ b/stack.sh
@@ -140,7 +140,7 @@
git_clone https://github.com/cloudbuilders/noVNC.git $NOVNC_DIR
# django powered web control panel for openstack
git_clone https://github.com/cloudbuilders/openstack-dashboard.git $DASH_DIR
-# add nixon, the iframing dashboard extension
+# add nixon, will use this to show munin graphs in dashboard
git clone https://github.com/jakedahn/nixon.git $NIXON_DIR
# python client library to nova that dashboard (and others) use
git_clone https://github.com/cloudbuilders/python-novaclient.git $NOVACLIENT_DIR
@@ -198,6 +198,8 @@
sudo touch $DASH_DIR/openstack-dashboard/quantum/client.py
cd $DASH_DIR/openstack-dashboard
+
+ # Includes settings for Nixon, to expose munin charts.
sudo cp $DIR/files/dash_settings.py local/local_settings.py
dashboard/manage.py syncdb