summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Joseph Barnhart Clark <dclark@pobox.com>2007-06-30 18:30:48 +0000
committerDaniel Joseph Barnhart Clark <dclark@pobox.com>2007-06-30 18:30:48 +0000
commit95a336566e209de6cd0c68c1b9137f486bf4fc36 (patch)
tree0685fa73886c685f9d064ac3265f81977da876e6 /src
parent90c003c8b39e31aae0c2626884180e0911a37c8c (diff)
downloadbcfg2-95a336566e209de6cd0c68c1b9137f486bf4fc36.tar.gz
bcfg2-95a336566e209de6cd0c68c1b9137f486bf4fc36.tar.bz2
bcfg2-95a336566e209de6cd0c68c1b9137f486bf4fc36.zip
Added address element and made help prettier for 80-col terminals
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3396 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
-rwxr-xr-xsrc/sbin/bcfg2-admin19
1 files changed, 12 insertions, 7 deletions
diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin
index 2e5d0777b..1b4f20d82 100755
--- a/src/sbin/bcfg2-admin
+++ b/src/sbin/bcfg2-admin
@@ -14,13 +14,18 @@ colors = ['steelblue1', 'chartreuse', 'gold', 'magenta', 'indianred1', 'limegree
usage = '''
bcfg2-admin [options]
fingerprint - print the server certificate fingerprint
-init - initialize the bcfg2 repository( this is interactive; only run once )
-pull <client> <entry type> <entry name> - mine statistics for entry information
-minestruct <client> - mine statistics for extra entries
-viz [--includehosts] [--includebundles] [--includekey] [-o output.png] [--raw]
-client add name= profile= uuid= password= secure= location=
+init - initialize the bcfg2 repository
+ (this is interactive; only run once)
+pull <client> <entry type> <entry name>
+ - mine statistics for entry information
+minestruct <client>
+ - mine statistics for extra entries
+viz [--includehosts] [--includebundles] [--includekey]
+ [-o output.png] [--raw]
+client add name= profile= uuid= password= address= secure= location=
tidy - clean up unused files from repo
-compare <config1.xml> <config2.xml> - compare two configurations for differences
+compare <config1.xml> <config2.xml>
+ - compare two configurations for differences
'''
config = '''
@@ -499,7 +504,7 @@ def do_client(repopath, args):
element = lxml.etree.Element("Client")
for i in args[1:]:
attr, val = i.split('=', 1)
- if not(attr in ['name', 'profile', 'uuid', 'password', 'secure', 'location']):
+ if not(attr in ['name', 'profile', 'uuid', 'password', 'address', 'secure', 'location']):
print "Attribute %s unknown" % attr
raise SystemExit, 1
element.attrib[attr] = val