diff options
| author | Andrew Brestick <brestick@mcs.anl.gov> | 2008-06-23 16:18:04 +0000 |
|---|---|---|
| committer | Andrew Brestick <brestick@mcs.anl.gov> | 2008-06-23 16:18:04 +0000 |
| commit | c746bdc6f47d023ff13fae99f218aac0cd54003e (patch) | |
| tree | 6696729c06427c60e22a0b53a09fa3ea7ed4002d /src/lib/Server/Admin | |
| parent | f26f2426d1b73b5bfddaef7b1700201876b64151 (diff) | |
| download | bcfg2-c746bdc6f47d023ff13fae99f218aac0cd54003e.tar.gz bcfg2-c746bdc6f47d023ff13fae99f218aac0cd54003e.tar.bz2 bcfg2-c746bdc6f47d023ff13fae99f218aac0cd54003e.zip | |
Resolves clients.xml overwrite issue in #567, fixes configuration issues with certain bcfg2-admin modes
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4706 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Admin')
| -rw-r--r-- | src/lib/Server/Admin/Fingerprint.py | 4 | ||||
| -rw-r--r-- | src/lib/Server/Admin/Minestruct.py | 4 | ||||
| -rw-r--r-- | src/lib/Server/Admin/Tidy.py | 4 | ||||
| -rw-r--r-- | src/lib/Server/Admin/Viz.py | 3 |
4 files changed, 15 insertions, 0 deletions
diff --git a/src/lib/Server/Admin/Fingerprint.py b/src/lib/Server/Admin/Fingerprint.py index bf50f0aaa..aff8d42bf 100644 --- a/src/lib/Server/Admin/Fingerprint.py +++ b/src/lib/Server/Admin/Fingerprint.py @@ -7,6 +7,10 @@ class Fingerprint(Bcfg2.Server.Admin.Mode): '''Produce server key fingerprint''' __shorthelp__ = 'bcfg2-admin fingerprint' __longhelp__ = __shorthelp__ + '\n\tPrint the server certificate fingerprint' + + def __init__(self, cfile): + Bcfg2.Server.Admin.Mode.__init__(self, cfile) + def __call__(self, args): Bcfg2.Server.Admin.Mode.__call__(self, args) print self.getFingerprint() diff --git a/src/lib/Server/Admin/Minestruct.py b/src/lib/Server/Admin/Minestruct.py index bd251dabf..9e91ff33e 100644 --- a/src/lib/Server/Admin/Minestruct.py +++ b/src/lib/Server/Admin/Minestruct.py @@ -4,6 +4,10 @@ class Minestruct(Bcfg2.Server.Admin.Mode): '''Pull extra entries out of statistics''' __shorthelp__ = 'bcfg2-admin minestruct <client>' __longhelp__ = __shorthelp__ + '\n\tExtract extra entry lists from statistics' + + def __init__(self, cfile): + Bcfg2.Server.Admin.Mode.__init__(self, cfile) + def __call__(self, args): Bcfg2.Server.Admin.Mode.__call__(self, args) if len(args) != 1: diff --git a/src/lib/Server/Admin/Tidy.py b/src/lib/Server/Admin/Tidy.py index aafd7b9a7..287b34310 100644 --- a/src/lib/Server/Admin/Tidy.py +++ b/src/lib/Server/Admin/Tidy.py @@ -4,6 +4,10 @@ import re, os, socket class Tidy(Bcfg2.Server.Admin.Mode): __shorthelp__ = 'bcfg2-admin tidy [-f] [-I]' __longhelp__ = __shorthelp__ + '\n\tClean up useless files in the repo' + + def __init__(self, cfile): + Bcfg2.Server.Admin.Mode.__init__(self, cfile) + def __call__(self, args): Bcfg2.Server.Admin.Mode.__call__(self, args) badfiles = self.buildTidyList() diff --git a/src/lib/Server/Admin/Viz.py b/src/lib/Server/Admin/Viz.py index f7daa9453..dfc8b3392 100644 --- a/src/lib/Server/Admin/Viz.py +++ b/src/lib/Server/Admin/Viz.py @@ -10,6 +10,9 @@ class Viz(Bcfg2.Server.Admin.Mode): 'indianred1', 'limegreen', 'orange1', 'lightblue2', 'green1', 'blue1', 'yellow1', 'darkturquoise', 'gray66'] + def __init__(self, cfile): + Bcfg2.Server.Admin.Mode.__init__(self, cfile) + def __call__(self, args): Bcfg2.Server.Admin.Mode.__call__(self, args) # First get options to the 'viz' subcommand |