diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-05-06 08:13:20 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-05-06 08:13:20 -0400 |
| commit | a4de0e44bd10761f5ec7d948fd0a3824720a90f2 (patch) | |
| tree | df582678a12f77a29fede1965727fb27c94ecbe1 /src/lib/Server/Lint/Validate.py | |
| parent | e38ea05100ddf670898f1d11ffc09b9d44435f27 (diff) | |
| download | bcfg2-a4de0e44bd10761f5ec7d948fd0a3824720a90f2.tar.gz bcfg2-a4de0e44bd10761f5ec7d948fd0a3824720a90f2.tar.bz2 bcfg2-a4de0e44bd10761f5ec7d948fd0a3824720a90f2.zip | |
Rewrote NagiosGen config to use NagiosGen/config.xml, which
understands <Group> and <Client> tags, rather than the client-specific
Properties/NagiosGen.xml and the group-specific but limited
NagiosGen/parents.xml. Includes schema and bcfg2-lint updates
necessary. Wrote conversion tool, nagiosgen-convert.py, which
converts everything but the <default/> tag in the old NagiosGen.xml,
which cannot be reasonably converted to StructFile format.
Also removed a _lot_ of string modification in NagiosGen.py, which
should make it a fair bit faster.
Diffstat (limited to 'src/lib/Server/Lint/Validate.py')
| -rw-r--r-- | src/lib/Server/Lint/Validate.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Server/Lint/Validate.py b/src/lib/Server/Lint/Validate.py index c7a77a4fb..c87c55ee9 100644 --- a/src/lib/Server/Lint/Validate.py +++ b/src/lib/Server/Lint/Validate.py @@ -23,7 +23,8 @@ class Validate(Bcfg2.Server.Lint.ServerlessPlugin): "%s/Deps/*.xml":"%s/deps.xsd", "%s/Decisions/*.xml":"%s/decisions.xsd", "%s/Packages/config.xml":"%s/packages.xsd", - "%s/GroupPatterns/config.xml":"%s/grouppatterns.xsd"} + "%s/GroupPatterns/config.xml":"%s/grouppatterns.xsd", + "%s/NagiosGen/config.xml":"%s/nagiosgen.xsd"} self.filelists = {} self.get_filelists() |