From 77cbb937c108869fbde5ab6fb132a8a05cd406a3 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Tue, 30 Oct 2007 03:14:44 +0000 Subject: Implement bcfg2-admin pull support for info files/metadata changes (Resolves Ticket #480) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3886 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Plugins/Cfg.py | 15 +++++++++++++-- src/lib/Server/Plugins/SSHbase.py | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) (limited to 'src/lib') diff --git a/src/lib/Server/Plugins/Cfg.py b/src/lib/Server/Plugins/Cfg.py index 987cc2da8..f653f53f3 100644 --- a/src/lib/Server/Plugins/Cfg.py +++ b/src/lib/Server/Plugins/Cfg.py @@ -127,7 +127,6 @@ class ConfigFileEntry(object): if basename in [':info', 'info']: return self.read_info(basename) elif basename in ['info.xml', ':info.xml']: - print "here" fpath = self.repopath + '/' + basename self.infoxml = Bcfg2.Server.Plugin.XMLSrc(fpath, True) return @@ -372,8 +371,20 @@ class Cfg(Bcfg2.Server.Plugin.Plugin): logger.error("Got unknown event %s %s:%s" % (action, event.requestID, event.filename)) self.interpolate = len([entry for entry in self.entries.values() if entry.interpolate ]) > 0 - def AcceptEntry(self, meta, _, entry_name, diff, fulldata): + def AcceptEntry(self, meta, _, entry_name, diff, fulldata, metadata_updates={}): '''per-plugin bcfg2-admin pull support''' + if metadata_updates: + if hasattr(self.Entries['ConfigFile'][entry_name], 'infoxml'): + print "InfoXML support not yet implemented" + elif raw_input("Should metadata updates apply to all hosts? (n/Y) ") in 'yY': + self.entries[entry_name].metadata.update(metadata_updates) + infofile = open(self.entries[entry_name].repopath + '/:info', 'w') + for x in self.entries[entry_name].metadata.iteritems(): + infofile.write("%s: %s\n" % x) + infofile.close() + if not diff or fulldata: + raise SystemExit, 0 + hsq = "Found host-specific file %s; Should it be updated (n/Y): " repo_vers = lxml.etree.Element('ConfigFile', name=entry_name) self.Entries['ConfigFile'][entry_name](repo_vers, meta) diff --git a/src/lib/Server/Plugins/SSHbase.py b/src/lib/Server/Plugins/SSHbase.py index 9e87a4fdc..4bf8909de 100644 --- a/src/lib/Server/Plugins/SSHbase.py +++ b/src/lib/Server/Plugins/SSHbase.py @@ -181,7 +181,7 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin, Bcfg2.Server.Plugin.DirectoryBacked): except OSError: self.logger.error("Failed to unlink temporary ssh keys") - def AcceptEntry(self, meta, _, entry_name, diff, fulldata): + def AcceptEntry(self, meta, _, entry_name, diff, fulldata, metadata_updates={}): '''per-plugin bcfg2-admin pull support''' filename = "%s/%s.H_%s" % (self.data, entry_name.split('/')[-1], meta.hostname) -- cgit v1.2.3-1-g7c22