← Back to branch summary

~salvatore-orlando/neutron/quantum-api

« back to all changes in this revision

Viewing changes to quantum/common/utils.py

  • Committer: Salvatore Orlando
  • Date: 2011-06-24 13:52:17 UTC
  • mfrom: (6.1.14 quantum-trunk)
  • Revision ID: salvatore.orlando@eu.citrix.com-20110624135217-h6uz1zu3fxxpf3wt
Merge trunk
Resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
quantum/common/utils.py
192
192
 
193
193
def getPluginFromConfig(file="config.ini"):
194
194
        Config = ConfigParser.ConfigParser()
195
 
        Config.read(os.path.join(FLAGS.state_path, file))
 
195
        Config.read(file)
196
196
        return Config.get("PLUGIN", "provider")
197
197
 
198
198