← Back to branch summary

~ubuntu-branches/ubuntu/quantal/quantum/quantal-updates

« back to all changes in this revision

Viewing changes to quantum/plugins/cisco/nexus/cisco_nexus_configuration.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman
  • Date: 2012-06-22 12:49:23 UTC
  • mfrom: (2.1.8)
  • Revision ID: package-import@ubuntu.com-20120622124923-5q185p2z7nooaxs0
Tags: 2012.2~f2~20120621.868-0ubuntu1
https://launchpad.net/bugs/999142
[ Chuck Short ]
* New upstream release.
* Add missing upsart jobs for agents. 
* Add sudo wrapper for quantum-rootwrap. (LP: #999142)

[ Adam Gandelman ]
* debian/control: Fix spacing issues that cause mk-build-deps to fail.
* debian/quantum-server.install: Install new plugins config directory
  instead of old .ini.

Show diffs side-by-side

added added

removed removed

Lines of Context:
quantum/plugins/cisco/nexus/cisco_nexus_configuration.py
22
22
This module will export the configuration parameters
23
23
from the nexus.ini file
24
24
"""
25
 
import os
26
25
 
27
 
from quantum.common.config import find_config_file
 
26
from quantum.common.utils import find_config_file
28
27
from quantum.plugins.cisco.common import cisco_configparser as confp
29
28
 
30
 
CP = confp.CiscoConfigParser(find_config_file({'plugin': 'cisco'}, None,
 
29
 
 
30
CP = confp.CiscoConfigParser(find_config_file({'plugin': 'cisco'},
31
31
                             "nexus.ini"))
32
32
 
33
33
SECTION = CP['SWITCH']