summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugo Hörnquist <hugo@lysator.liu.se>2022-01-01 23:00:55 +0100
committerHugo Hörnquist <hugo@lysator.liu.se>2022-01-01 23:00:55 +0100
commit47b7cf515de6ba9d1d65255aef98362ddb5870de (patch)
tree722b187510c967227b5cdb5b1d4646dee4ba9d6e
parentSetup nspawn? (diff)
downloadwebdav_server-47b7cf515de6ba9d1d65255aef98362ddb5870de.tar.gz
webdav_server-47b7cf515de6ba9d1d65255aef98362ddb5870de.tar.xz
Revert "Add node classifier."
This reverts commit d4f36c7bd68a5c8f6269e765e9819b6bb0e2eef4.
-rw-r--r--modules/profiles/files/node-classifier.py29
-rw-r--r--modules/profiles/manifests/puppetserver.pp11
2 files changed, 1 insertions, 39 deletions
diff --git a/modules/profiles/files/node-classifier.py b/modules/profiles/files/node-classifier.py
deleted file mode 100644
index 3edefd4..0000000
--- a/modules/profiles/files/node-classifier.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env pythton
-
-import yaml
-import sys
-
-# https://puppet.com/docs/puppet/7/nodes_external.html
-
-data = {
- 'yoursql.adrift.space': {
- # must contain at least either classes or parameters
- 'classes': [
- 'profiles::common',
- ],
- 'environment': 'mysql',
- },
-}
-
-def main(args):
- if len(args) == 1:
- print('usage ./node-classifier <node-name>')
- return
-
- nodename = sys.argv[1]
- instance = data.get(nodename)
- if not instance: return 1
- 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..8620fae 100644
--- a/modules/profiles/manifests/puppetserver.pp
+++ b/modules/profiles/manifests/puppetserver.pp
@@ -2,15 +2,6 @@ class profiles::puppetserver {
# required for the git hook
ensure_packages(['ruby'])
- file { '/usr/libexec':
- ensure => directory,
- }
-
- file { '/usr/libexec/external-node-classifier':
- mode => '0555',
- source => 'puppet:///modules/profiles/node-classifier.py',
- }
-
class { 'puppet':
server => true,
server_foreman => false,
@@ -18,7 +9,7 @@ class profiles::puppetserver {
server_storeconfigs => true,
server_git_repo => true,
server_git_repo_path => '/var/lib/puppet.git',
- server_external_nodes => '/usr/libexec/external-node-classifier',
+ server_external_nodes => '',
server_strict_variables => true,
}
}