summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2009-03-09 14:35:35 -0400
committerMichael DeHaan <mdehaan@redhat.com>2009-03-09 14:36:47 -0400
commitf2c260e2a78624a8f3d10f00d8894f0d908fd201 (patch)
treee7d469fbfd14350586c47b190f8065e58c4c7f0f
parentc828472ced0571449979f21ed71d6a2c8f7ccc62 (diff)
downloadcobbler-f2c260e2a78624a8f3d10f00d8894f0d908fd201.tar.gz
cobbler-f2c260e2a78624a8f3d10f00d8894f0d908fd201.tar.xz
cobbler-f2c260e2a78624a8f3d10f00d8894f0d908fd201.zip
Make cobbler-ext-nodes (puppet integration component) use the new YAML parser
-rw-r--r--scripts/cobbler-ext-nodes4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/cobbler-ext-nodes b/scripts/cobbler-ext-nodes
index f9510c0d..919bc948 100644
--- a/scripts/cobbler-ext-nodes
+++ b/scripts/cobbler-ext-nodes
@@ -1,6 +1,6 @@
#!/usr/bin/python
-from cobbler import yaml as yaml
+import yaml # PyYAML version
import urlgrabber
import sys
@@ -15,7 +15,7 @@ if __name__ == "__main__":
conf = open("/etc/cobbler/settings")
data = conf.read()
conf.close()
- server = yaml.load(data).next()["server"]
+ server = yaml.load(data)["server"]
url = "http://%s/cblr/svc/op/puppet/hostname/%s" % (server, hostname)
print urlgrabber.urlread(url)