← Back to branch summary

~vila/uci-engine/enable-nova-and-swift

« back to all changes in this revision

Viewing changes to ticket_system/ticket_system/settings.py

  • Committer: Evan Dandrea
  • Date: 2014-06-30 12:07:54 UTC
  • mfrom: (630 uci-engine)
  • mto: This revision was merged to the branch mainline in revision 655.
  • Revision ID: evan.dandrea@canonical.com-20140630120754-z6x5eqdahpp2qfrt
Merge with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ticket_system/ticket_system/settings.py
216
216
except ImportError:
217
217
    pass
218
218
 
219
 
# Pull in juju_settings
220
 
try:
221
 
    p = os.path.join(os.path.dirname(__file__), '../juju_settings')
222
 
    p = os.path.join(os.path.abspath(p), '*.py')
223
 
    for f in sorted(glob.glob(p)):
224
 
        execfile(f)
225
 
except ImportError:
226
 
    pass
227
 
 
228
219
try:
229
220
    from db_settings import DATABASES
230
221
except ImportError:
231
222
    pass
 
223
 
 
224
# If there are juju extra settings pull those in.
 
225
PROJECT_DIR = os.path.join(os.path.abspath(os.path.dirname(__file__)),
 
226
                           '../../../juju/settings/')
 
227
 
 
228
conffiles = glob.glob(os.path.join(PROJECT_DIR, '*.py'))
 
229
conffiles.sort()
 
230
 
 
231
for f in conffiles:
 
232
    execfile(os.path.abspath(f))