From dd85a75bed17c049e44394571b07ea431e41d8f7 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Thu, 7 Oct 2004 13:37:19 +0000 Subject: add profile assertion support (Logical change 1.77) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@375 ce84e21b-d406-0410-9b95-82705330c041 --- src/sbin/Bcfg2Server | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/sbin') diff --git a/src/sbin/Bcfg2Server b/src/sbin/Bcfg2Server index 6575326ce..dde064474 100644 --- a/src/sbin/Bcfg2Server +++ b/src/sbin/Bcfg2Server @@ -44,13 +44,6 @@ class BcfgServer(Server): self.LogFailure("Cron") return 0 - def GetMetadata(self, client): - if self.metadata.clients.has_key(client): - return self.metadata.clients[client] - else: - syslog(LOG_INFO, "Inserting default metadata for client %s"%(client)) - pass - def BuildConfig(self, xml, (peer,port)): try: client = gethostbyaddr(peer)[0].split('.')[0] @@ -59,7 +52,11 @@ class BcfgServer(Server): t = time() config = Element("Configuration", version='2.0') # get metadata for host - m = self.GetMetadata(client) + if xml.attrib.has_key("profile") and xml.attrib.has_key("image"): + m = self.metadata.FetchMetadata(client, image=xml.attrib['image'], profile=xml.attrib['profile']) + else: + m = self.metadata.FetchMetadata(client) + try: structures = self.core.GetStructures(m) except: -- cgit v1.2.3-1-g7c22