[whimsy] branch master updated: Puppet 6 moved the files

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new 596a44e  Puppet 6 moved the files
596a44e is described below

commit 596a44e3e4222f26b454babc0b0b89d25b6a7dee
Author: Sebb <s...@apache.org>
AuthorDate: Mon May 10 11:10:39 2021 +0100

    Puppet 6 moved the files
---
 tools/vhosttest.rb | 10 ++++------
 tools/xx           |  0
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/tools/vhosttest.rb b/tools/vhosttest.rb
index cee3269..906b6de 100755
--- a/tools/vhosttest.rb
+++ b/tools/vhosttest.rb
@@ -12,21 +12,19 @@ require 'whimsy/asf'
 IP = ARGV.shift or raise RuntimeError.new "Need path to infrastructure puppet 
checkout"
 
 module Puppet
-  module Parser
-    module Functions
-      def self.newfunction(*args)
-      end
+  module Functions
+    def self.newfunction(*args)
     end
   end
 end
 
 require 'yaml'
-require 
"#{IP}/modules/vhosts_whimsy/lib/puppet/parser/functions/preprocess_vhosts.rb"
+require "#{IP}/modules/vhosts_whimsy/lib/puppet/functions/preprocess_vhosts.rb"
 
 yaml = Dir["#{IP}/data/nodes/whimsy-vm*.apache.org.yaml"].
   max_by {|path| path[/-vm(\d+)/, 1].to_i}
 facts = YAML.load_file(yaml)['vhosts_whimsy::vhosts::vhosts']['whimsy-vm-443']
 ldap = ASF::LDAP::RO_HOSTS.join(' ') # to be closer to live site
 
-macros = Puppet::Parser::Functions::ApacheVHostMacros.new(facts, ldap)
+macros = Puppet::Functions::ApacheVHostMacros.new(facts, ldap)
 puts macros.result['custom_fragment']
diff --git a/tools/xx b/tools/xx
new file mode 100644
index 0000000..e69de29