diff options
| author | Andrew Brestick <brestick@mcs.anl.gov> | 2008-06-20 15:04:33 +0000 |
|---|---|---|
| committer | Andrew Brestick <brestick@mcs.anl.gov> | 2008-06-20 15:04:33 +0000 |
| commit | 38b68c3c5f4024160a7acb90cfd621d3f13bce32 (patch) | |
| tree | 901fb630c2cd7edae8d748c441668f479759662b /src/sbin/bcfg2-admin | |
| parent | c4de45d84a95ec7e3b61780eae6a591885fc9bbf (diff) | |
| download | bcfg2-38b68c3c5f4024160a7acb90cfd621d3f13bce32.tar.gz bcfg2-38b68c3c5f4024160a7acb90cfd621d3f13bce32.tar.bz2 bcfg2-38b68c3c5f4024160a7acb90cfd621d3f13bce32.zip | |
Probe data loaded whenever Metadata plugin is used
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4702 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/sbin/bcfg2-admin')
| -rwxr-xr-x | src/sbin/bcfg2-admin | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin index 5b5053135..bb44bbc3f 100755 --- a/src/sbin/bcfg2-admin +++ b/src/sbin/bcfg2-admin @@ -2,7 +2,7 @@ '''bcfg2-admin is a script that helps to administrate a bcfg2 deployment''' import getopt, logging, sys -import Bcfg2.Server.Core, Bcfg2.Logging +import Bcfg2.Server.Core, Bcfg2.Logging, Bcfg2.Options log = logging.getLogger('bcfg-admin') @@ -17,10 +17,8 @@ def mode_import(modename): if __name__ == '__main__': Bcfg2.Logging.setup_logging('bcfg2-admin', to_console=True) - - # Some sensible defaults - configfile = "/etc/bcfg2.conf" - + # Get config file path + configfile = Bcfg2.Options.CFILE.default try: opts, args = getopt.getopt(sys.argv[1:], 'hC:', ['help', 'configfile=']) except getopt.GetoptError, msg: |