diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-01-01 23:26:42 +0100 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-01-01 23:29:01 +0100 |
| commit | 7add553b52cb64b02f4ed9568759e7e9a7f1a90f (patch) | |
| tree | 6f0db3ed33f41b47435d91b7e8296a3ae87aee9a | |
| parent | Revert "Revert "Add node classifier."" (diff) | |
| download | webdav_server-7add553b52cb64b02f4ed9568759e7e9a7f1a90f.tar.gz webdav_server-7add553b52cb64b02f4ed9568759e7e9a7f1a90f.tar.xz | |
Made node-classifier not fail on missing name.
| -rw-r--r-- | modules/profiles/files/node-classifier.py | 12 | ||||
| -rw-r--r-- | modules/profiles/manifests/puppetserver.pp | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/modules/profiles/files/node-classifier.py b/modules/profiles/files/node-classifier.py index 3edefd4..be8df7e 100644 --- a/modules/profiles/files/node-classifier.py +++ b/modules/profiles/files/node-classifier.py @@ -1,4 +1,4 @@ -#!/usr/bin/env pythton +#!/usr/bin/env python3 import yaml import sys @@ -15,6 +15,10 @@ data = { }, } +default_data = { + 'parameters': {}, +} + def main(args): if len(args) == 1: print('usage ./node-classifier <node-name>') @@ -22,8 +26,10 @@ def main(args): nodename = sys.argv[1] instance = data.get(nodename) - if not instance: return 1 - print(yaml.dump(instance)) + if not instance: + print(yaml.dump(default_data)) + else: + print(yaml.dump(instance)) if __name__ == '__main__': sys.exit(main(sys.argv)) diff --git a/modules/profiles/manifests/puppetserver.pp b/modules/profiles/manifests/puppetserver.pp index 5bc1c3b..0ba244d 100644 --- a/modules/profiles/manifests/puppetserver.pp +++ b/modules/profiles/manifests/puppetserver.pp @@ -6,6 +6,8 @@ class profiles::puppetserver { ensure => directory, } + ensure_packages(['python3-yaml']) + file { '/usr/libexec/external-node-classifier': mode => '0555', source => 'puppet:///modules/profiles/node-classifier.py', |