← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ppa-assigner/ppa_assigner/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:
ppa-assigner/ppa_assigner/settings.py
155
155
except ImportError:
156
156
    pass
157
157
 
158
 
# Pull in juju_settings
159
 
try:
160
 
    p = os.path.join(BASEDIR, 'juju_settings', '*.py')
161
 
    for f in sorted(glob.glob(p)):
162
 
        execfile(f)
163
 
except ImportError:
164
 
    pass
165
 
 
166
158
INSTALLED_APPS = LOCAL_APPS + REQUIRED_APPS
 
159
 
 
160
# If there are juju extra settings pull those in.
 
161
PROJECT_DIR = os.path.join(os.path.abspath(os.path.dirname(__file__)),
 
162
                           '../../../juju/settings/')
 
163
 
 
164
conffiles = glob.glob(os.path.join(PROJECT_DIR, '*.py'))
 
165
conffiles.sort()
 
166
 
 
167
for f in conffiles:
 
168
    execfile(os.path.abspath(f))