diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-11-13 07:30:17 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-11-13 07:31:00 -0500 |
| commit | 1afd6b3c9edcf4f30af95fa4504b5da45509828f (patch) | |
| tree | 45d611f8c88088bb3e38ecaf3485ded94188c758 /src/lib/Bcfg2/Server/Plugins/NagiosGen.py | |
| parent | e110656667f96b6beb7e7b5a2407316678669bcc (diff) | |
| download | bcfg2-1afd6b3c9edcf4f30af95fa4504b5da45509828f.tar.gz bcfg2-1afd6b3c9edcf4f30af95fa4504b5da45509828f.tar.bz2 bcfg2-1afd6b3c9edcf4f30af95fa4504b5da45509828f.zip | |
allow setting NagiosGen Options while using the default client
settings (from Marc Gariepy)
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/NagiosGen.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/NagiosGen.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/NagiosGen.py b/src/lib/Bcfg2/Server/Plugins/NagiosGen.py index fbad0a37b..023547b7e 100644 --- a/src/lib/Bcfg2/Server/Plugins/NagiosGen.py +++ b/src/lib/Bcfg2/Server/Plugins/NagiosGen.py @@ -81,7 +81,7 @@ class NagiosGen(Bcfg2.Server.Plugin.Plugin, if xtra: host_config.extend([self.line_fmt % (opt, val) for opt, val in list(xtra.items())]) - else: + if 'use' not in xtra: host_config.append(self.line_fmt % ('use', 'default')) host_config.append('}') |