Issue 3574 - Refactor Puppet class base into class adblockplus

hiera/puppet_node_classifier.rb

 #!/usr/bin/ruby
 # This script is a node classifier for Puppet that operates on top of Hiera
 # and uses a custom hosts.yaml config to map host roles.
 
 require 'getoptlong'
 require 'hiera'
 require 'socket'
 require 'yaml'
 
 # Where to search for the Hiera configuration
@@ skipping 46 matching lines @@
 #{BASENAME}: unknown option: #{ARGV[0]}
 #{BASENAME}: try #{BASENAME} --help
 END
     exit 1
 end
 
 # Extract the server -> hostname -> role information from the hosts
 # configuration file:
 begin
   config = YAML.load_file(HOSTS_CONFIG)
-  servers = config.fetch("servers", {})
+  servers = config.fetch("adblockplus::hosts", {})
   host = servers.fetch(hostname, {})
   role = host.fetch("role", "default")
 rescue Exception => error
   STDERR.puts "#{BASENAME}: #{error.message}: #{HOSTS_CONFIG}"
   exit 1
 end
 
 # Map Hiera data into the structure Puppet expects an ENC to generate (see
 # https://docs.puppetlabs.com/guides/external_nodes.html for more info):
 begin
   hiera = Hiera.new(:config => HIERA_CONFIG)
   scope = {'::hostname' => hostname, '::role' => role}
   classes = hiera.lookup('classes', {}, scope, nil, :hash)
   parameters = hiera.lookup('parameters', {}, scope, nil, :hash)
   parameters['role'] = role
   result = { 'classes' => classes, 'parameters' => parameters }
 rescue Exception => error
   STDERR.puts "#{BASENAME}: #{error.message}: #{HIERA_CONFIG}"
   exit 1
 end
 
 puts result.to_yaml