diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2004-10-07 13:37:19 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2004-10-07 13:37:19 +0000 |
| commit | dd85a75bed17c049e44394571b07ea431e41d8f7 (patch) | |
| tree | 088c147adb76bb780ce0d13d9d4742520da02377 /src/sbin | |
| parent | 1106b939ce92a1280e1b8819b357c6294683248e (diff) | |
| download | bcfg2-dd85a75bed17c049e44394571b07ea431e41d8f7.tar.gz bcfg2-dd85a75bed17c049e44394571b07ea431e41d8f7.tar.bz2 bcfg2-dd85a75bed17c049e44394571b07ea431e41d8f7.zip | |
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
Diffstat (limited to 'src/sbin')
| -rw-r--r-- | src/sbin/Bcfg2Server | 13 |
1 files changed, 5 insertions, 8 deletions
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: |