Cleans up the settings files.

Removes deprecated settings, makes sure os.path.abspath is
always used consistently, and generally tidies up.

Change-Id: Ib0e3ef454ac8c9ef74e987b6088df6c744a2ab44

horizon/tests/testsettings.py

@@ -76,7 +76,6 @@ ROOT_URLCONF = 'horizon.tests.testurls'
 TEMPLATE_DIRS = (os.path.join(ROOT_PATH, 'tests', 'templates'))
 SITE_ID = 1
 SITE_BRANDING = 'OpenStack'
-SITE_NAME = 'openstack'
 
 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
 NOSE_ARGS = ['--nocapture',
@@ -105,9 +104,7 @@ AVAILABLE_REGIONS = [
     ('http://remote:5000/v2.0', 'remote'),
 ]
 
-OPENSTACK_ADDRESS = "localhost"
-OPENSTACK_ADMIN_TOKEN = "openstack"
-OPENSTACK_KEYSTONE_URL = "http://%s:5000/v2.0" % OPENSTACK_ADDRESS
+OPENSTACK_KEYSTONE_URL = "http://localhost:5000/v2.0"
 OPENSTACK_KEYSTONE_DEFAULT_ROLE = "Member"
 
 OPENSTACK_KEYSTONE_BACKEND = {

openstack_dashboard/local/local_settings.py.example

@@ -4,7 +4,6 @@ from django.utils.translation import ugettext_lazy as _
 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
-PROD = False
 
 # Set SSL proxy settings:
 # For Django 1.4+ pass this header from the proxy after terminating the SSL,
@@ -72,12 +71,6 @@ OPENSTACK_KEYSTONE_BACKEND = {
 # providing a paging element (a "more" link) to paginate results.
 API_RESULT_LIMIT = 1000
 
-# If you have external monitoring links, eg:
-# EXTERNAL_MONITORING = [
-#     ['Nagios','http://foo.com'],
-#     ['Ganglia','http://bar.com'],
-# ]
-
 LOGGING = {
         'version': 1,
         # When set to True this will disable all logging except

openstack_dashboard/settings.py

@@ -23,6 +23,7 @@ import os
 import sys
 
 ROOT_PATH = os.path.dirname(os.path.abspath(__file__))
+BIN_DIR = os.path.abspath(os.path.join(ROOT_PATH, '..', 'bin'))
 
 if ROOT_PATH not in sys.path:
     sys.path.append(ROOT_PATH)
@@ -32,8 +33,6 @@ TEMPLATE_DEBUG = DEBUG
 
 SITE_ID = 1
 SITE_BRANDING = 'OpenStack'
-SITE_NAME = 'openstack'
-ENABLE_VNC = True
 
 LOGIN_URL = '/auth/login'
 LOGIN_REDIRECT_URL = '/'
@@ -44,8 +43,6 @@ STATIC_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'static'))
 STATIC_URL = '/static/'
 ADMIN_MEDIA_PREFIX = '/static/admin/'
 
-CREDENTIAL_AUTHORIZATION_DAYS = '5'
-
 ROOT_URLCONF = 'openstack_dashboard.urls'
 
 HORIZON_CONFIG = {
@@ -91,8 +88,7 @@ STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
 )
 
-less_binary = os.path.join(
-        os.path.dirname(__file__), '..', 'bin', 'less', 'lessc')
+less_binary = os.path.join(BIN_DIR, 'less', 'lessc')
 COMPRESS_PRECOMPILERS = (
     ('text/less', (less_binary + ' {infile} {outfile}')),
 )