puppet 6.22.1 → 6.25.1

data/ext/suse/puppet.spec

@@ -1,310 +0,0 @@
-%{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
-%define pbuild %{_builddir}/%{name}-%{version}
-%define confdir conf/suse
-
-Summary: A network tool for managing many disparate systems
-Name: puppet
-Version: 3.0.0
-Release: 1%{?dist}
-License: Apache 2.0
-Group:    Productivity/Networking/System
-
-URL: https://puppetlabs.com/projects/puppet/
-Source0: https://puppetlabs.com/downloads/puppet/%{name}-%{version}.tar.gz
-
-PreReq: %{insserv_prereq} %{fillup_prereq}
-Requires: ruby >= 1.8.7
-Requires: facter >= 1:1.7.0
-Requires: cron
-Requires: logrotate
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ruby >= 1.8.7
-BuildRequires: klogd
-BuildRequires: sysconfig
-
-%description
-Puppet lets you centrally manage every important aspect of your system using a 
-cross-platform specification language that manages all the separate elements 
-normally aggregated in different files, like users, cron jobs, and hosts, 
-along with obviously discrete elements like packages, services, and files.
-
-%package server
-Group:    Productivity/Networking/System
-Summary: Server for the puppet system management tool
-Requires: puppet = %{version}-%{release}
-
-%description server
-Provides the central puppet server daemon which provides manifests to clients.
-The server can also function as a certificate authority and file server.
-
-%prep
-%setup -q -n %{name}-%{version}
-
-%build
-for f in bin/*; do
- sed -i -e '1s,^#!.*ruby$,#!/usr/bin/ruby,' $f
-done
-
-%install
-%{__install} -d -m0755 %{buildroot}%{_bindir}
-%{__install} -d -m0755 %{buildroot}%{_confdir}
-%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}
-%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/puppet/manifests
-%{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version}
-%{__install} -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet
-%{__install} -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
-%{__install} -d -m0755 %{buildroot}%{_localstatedir}/log/puppet
-%{__install} -Dp -m0755 %{pbuild}/bin/* %{buildroot}%{_bindir}
-%{__install} -Dp -m0644 %{pbuild}/lib/puppet.rb %{buildroot}%{ruby_sitelibdir}/puppet.rb
-%{__cp} -a %{pbuild}/lib/puppet %{buildroot}%{ruby_sitelibdir}
-find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -exec chmod a-x '{}' \;
-%{__cp} -a %{pbuild}/ext/redhat/client.sysconfig %{buildroot}%{_confdir}/client.sysconfig
-%{__install} -Dp -m0644 %{buildroot}%{_confdir}/client.sysconfig %{buildroot}/var/adm/fillup-templates/sysconfig.puppet
-%{__cp} -a %{pbuild}/ext/redhat/server.sysconfig %{buildroot}%{_confdir}/server.sysconfig
-%{__install} -Dp -m0644 %{buildroot}%{_confdir}/server.sysconfig %{buildroot}/var/adm/fillup-templates/sysconfig.puppetmaster
-%{__cp} -a %{pbuild}/ext/redhat/fileserver.conf %{buildroot}%{_confdir}/fileserver.conf
-%{__install} -Dp -m0644 %{buildroot}%{_confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf
-%{__cp} -a %{pbuild}/ext/redhat/puppet.conf %{buildroot}%{_confdir}/puppet.conf
-%{__install} -Dp -m0644 %{buildroot}%{_confdir}/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf
-%{__cp} -a %{pbuild}/ext/redhat/logrotate %{buildroot}%{_confdir}/logrotate
-%{__install} -Dp -m0644 %{buildroot}%{_confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet
-%{__install} -Dp -m0755 %{confdir}/client.init %{buildroot}%{_initrddir}/puppet
-%{__install} -Dp -m0755 %{confdir}/server.init %{buildroot}%{_initrddir}/puppetmaster
-
-%files
-%defattr(-, root, root, 0755)
-%{_bindir}/puppet
-%{ruby_sitelibdir}/*
-%{_initrddir}/puppet
-/var/adm/fillup-templates/sysconfig.puppet
-%config(noreplace) %{_sysconfdir}/puppet/puppet.conf
-%doc COPYING LICENSE README examples
-%config(noreplace) %{_sysconfdir}/logrotate.d/puppet
-%dir %{_sysconfdir}/puppet
-# These need to be owned by puppet so the server can
-# write to them
-%attr(-, puppet, puppet) %{_localstatedir}/run/puppet
-%attr(-, puppet, puppet) %{_localstatedir}/log/puppet
-%attr(-, puppet, puppet) %{_localstatedir}/lib/puppet
-
-%files server
-%defattr(-, root, root, 0755)
-%{_initrddir}/puppetmaster
-%config(noreplace) %{_sysconfdir}/puppet/*
-%exclude %{_sysconfdir}/puppet/puppet.conf
-/var/adm/fillup-templates/sysconfig.puppetmaster
-%dir %{_sysconfdir}/puppet
-
-%pre
-/usr/sbin/groupadd -r puppet 2>/dev/null || :
-/usr/sbin/useradd -g puppet -c "Puppet" \
-    -s /sbin/nologin -r -d /var/puppet puppet 2> /dev/null || :
-
-%post
-%{fillup_and_insserv -y puppet}
-
-%post server
-%{fillup_and_insserv -n -y puppetmaster}
-
-%preun
-%stop_on_removal puppet
-
-%preun server
-%stop_on_removal puppetmaster
-
-%postun
-%restart_on_update puppet
-%{insserv_cleanup}
-
-%postun server
-%restart_on_update puppetmaster
-%{insserv_cleanup}
-
-%clean
-%{__rm} -rf %{buildroot}
-
-%changelog
-* Mon Oct 08 2012 Matthaus Owens <matthaus@puppetlabs.com> - 3.0.0-1
-- Update for deprecated binary removal, ruby version requirements
-
-* Fri Aug 24 2012 Eric Sorenson <eric0@puppetlabs.com> - 3.0.0-0.1rc4
-- Update facter version dependency
-- Update for 3.0.0-0.1rc4
-
-* Wed May 02 2012 Moses Mendoza <moses@puppetlabs.com> - 2.7.14-1
-- Update for 2.7.14
-
-* Mon Mar 12 2012 Michael Stahnke <stahnma@puppetlabs.com> - 2.7.12-1
-- Update for 2.7.12
-
-* Wed Jan 25 2012 Michael Stahnke <stahnma@puppetlabs.com> - 2.7.10-1
-- Update for 2.7.10
-
-* Wed Nov 30 2011 Michael Stahnke <stahnma@puppetlabs.com> - 2.7.8-0.1rc1
-- Update for 2.7.8rc1
-
-* Mon Nov 21 2011 Michael Stahnke <stahnma@puppetlabs.com> - 2.7.7-1
-- Release 2.7.7
-
-* Wed Jul 06 2011 Michael Stahnke <stahnma@puppetlabs.com> - 2.7.2-0.1rc1
-- Updating to 2.7.2rc1
-
-* Tue Sep 14 2010 Ben Kevan <ben.kevan@gmail.com> - 2.6.1
-- New version to 2.6.1
-- Add client.init and server.init from source since it's now included in the packages
-- Change BuildRequires Ruby version to match Requires Ruby version
-- Removed ruby-env patch, replaced with sed in prep
-- Update urls to puppetlabs.com
-
-* Wed Jul 21 2010 Ben Kevan <ben.kevan@gmail.com> - 2.6.0
-- New version and ruby version bump
-- Add puppetdoc to %_bindir (unknown why original suse package, excluded or forgot to add)
-- Corrected patch for ruby environment
-- Move binaries back to the correct directories
-
-* Wed Jul 14 2010 Ben Kevan <ben.kevan@gmail.com> - 0.25.5
-- New version.
-- Use original client, server.init names
-- Revert to puppetmaster
-- Fixed client.init and server.init and included $null and Should-Stop for both
-
-* Tue Mar 2 2010 Martin Vuk  <martin.vuk@fri.uni-lj.si> - 0.25.4
-- New version.
-
-* Sun Aug 9 2009 Noah Fontes <nfontes@transtruct.org>
-- Fix build on SLES 9.
-- Enable puppet and puppet-server services by default.
-
-* Sat Aug 8 2009 Noah Fontes <nfontes@transtruct.org>
-- Fix a lot of relevant warnings from rpmlint.
-- Build on OpenSUSE 11.1 correctly.
-- Rename puppetmaster init scripts to puppet-server to correspond to the package name.
-
-* Wed Apr 22 2009 Leo Eraly  <leo@unstable.be> - 0.24.8
-- New version.
-
-* Tue Dec 9 2008 Leo Eraly  <leo@unstable.be> - 0.24.6
-- New version.
-
-* Fri Sep 5 2008 Leo Eraly  <leo@unstable.be> - 0.24.5
-- New version.
-
-* Fri Jun 20 2008 Martin Vuk  <martin.vuk@fri.uni-lj.si> - 0.24.4
-- Removed symlinks to old configuration files
-
-* Fri Dec 14 2007 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.24.0
-- New version.
-
-* Fri Jun  29 2007 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.23.0
-- New version.
-
-* Wed May  2 2007 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.22.4
-- New version. Includes provider for rug package manager.
-
-* Wed Apr 25  2007 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.22.3
-- New version. Added links /sbin/rcpuppet and /sbin/rcpuppetmaster
-
-* Sun Jan  7  2007 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.22.0
-- version bump
-
-* Tue Oct  3  2006 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.19.3-3
-- Made package arch dependant.
-
-* Sat Sep 23  2006 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.19.3-1
-- New version
-
-* Sun Sep 17  2006 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.19.1-1
-- New version
-
-* Tue Aug  30 2006 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.19.0-1
-- New version
-- No need to patch anymore :-), since my changes went into official release.
-
-* Tue Aug  3 2006 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.18.4-3
-- Replaced puppet-bin.patch with %build section from David's spec
-
-* Tue Aug  1 2006 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.18.4-2
-- Added supprot for enabling services in SuSE
- 
-* Tue Aug  1 2006 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.18.4-1
-- New version and support for SuSE
-
-* Wed Jul  5 2006 David Lutterkort <dlutter@redhat.com> - 0.18.2-1
-- New version
-
-* Wed Jun 28 2006 David Lutterkort <dlutter@redhat.com> - 0.18.1-1
-- Removed lsb-config.patch and yumrepo.patch since they are upstream now
-
-* Mon Jun 19 2006 David Lutterkort <dlutter@redhat.com> - 0.18.0-1
-- Patch config for LSB compliance (lsb-config.patch)
-- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl 
-  to /var/lib/puppet, /etc/puppet/clases.txt to /var/lib/puppet/classes.txt,
-  /etc/puppet/localconfig.yaml to /var/lib/puppet/localconfig.yaml
-
-* Fri May 19 2006 David Lutterkort <dlutter@redhat.com> - 0.17.2-1
-- Added /usr/bin/puppetrun to server subpackage
-- Backported patch for yumrepo type (yumrepo.patch)
-
-* Wed May  3 2006 David Lutterkort <dlutter@redhat.com> - 0.16.4-1
-- Rebuilt
-
-* Fri Apr 21 2006 David Lutterkort <dlutter@redhat.com> - 0.16.0-1
-- Fix default file permissions in server subpackage
-- Run puppetmaster as user puppet
-- rebuilt for 0.16.0
-
-* Mon Apr 17 2006 David Lutterkort <dlutter@redhat.com> - 0.15.3-2
-- Don't create empty log files in post-install scriptlet
-
-* Fri Apr  7 2006 David Lutterkort <dlutter@redhat.com> - 0.15.3-1
-- Rebuilt for new version
-
-* Wed Mar 22 2006 David Lutterkort <dlutter@redhat.com> - 0.15.1-1
-- Patch0: Run puppetmaster as root; running as puppet is not ready 
-  for primetime
-
-* Mon Mar 13 2006 David Lutterkort <dlutter@redhat.com> - 0.15.0-1
-- Commented out noarch; requires fix for bz184199
-
-* Mon Mar  6 2006 David Lutterkort <dlutter@redhat.com> - 0.14.0-1
-- Added BuildRequires for ruby
-
-* Wed Mar  1 2006 David Lutterkort <dlutter@redhat.com> - 0.13.5-1
-- Removed use of fedora-usermgmt. It is not required for Fedora Extras and
-  makes it unnecessarily hard to use this rpm outside of Fedora. Just
-  allocate the puppet uid/gid dynamically
-
-* Sun Feb 19 2006 David Lutterkort <dlutter@redhat.com> - 0.13.0-4
-- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed 
-problem with listing fileserver.conf and puppetmaster.conf twice
-
-* Wed Feb  8 2006 David Lutterkort <dlutter@redhat.com> - 0.13.0-3
-- Fix puppetd.conf
-
-* Wed Feb  8 2006 David Lutterkort <dlutter@redhat.com> - 0.13.0-2
-- Changes to run puppetmaster as user puppet
-
-* Mon Feb  6 2006 David Lutterkort <dlutter@redhat.com> - 0.13.0-1
-- Don't mark initscripts as config files
-
-* Mon Feb  6 2006 David Lutterkort <dlutter@redhat.com> - 0.12.0-2
-- Fix BuildRoot. Add dist to release
-
-* Tue Jan 17 2006 David Lutterkort <dlutter@redhat.com> - 0.11.0-1
-- Rebuild
-
-* Thu Jan 12 2006 David Lutterkort <dlutter@redhat.com> - 0.10.2-1
-- Updated for 0.10.2 Fixed minor kink in how Source is given
-
-* Wed Jan 11 2006 David Lutterkort <dlutter@redhat.com> - 0.10.1-3
-- Added basic fileserver.conf
-
-* Wed Jan 11 2006 David Lutterkort <dlutter@redhat.com> - 0.10.1-1
-- Updated. Moved installation of library files to sitelibdir. Pulled 
-initscripts into separate files. Folded tools rpm into server
-
-* Thu Nov 24 2005 Duane Griffin <d.griffin@psenterprise.com>
-- Added init scripts for the client
-
-* Wed Nov 23 2005 Duane Griffin <d.griffin@psenterprise.com>
-- First packaging

data/ext/suse/server.init

@@ -1,173 +0,0 @@
-#!/bin/bash
-# puppetmaster  This shell script enables the puppetmaster server.
-#
-# Author:       Duane Griffin <d.griffin@psenterprise.com>
-#               Martin Vuk <martin.vuk@fri.uni-lj.si> (SuSE support)
-#
-# chkconfig: - 65 45
-#
-# description: Server for the puppet system management tool.
-# processname: puppetmaster
-
-### BEGIN INIT INFO
-# Provides: puppetmaster
-# Required-Start: $local_fs $remote_fs $network $syslog
-# Should-Start: puppetmaster
-# Required-Stop: $local_fs $remote_fs $network $syslog
-# Should-Stop: puppetmaster
-# Default-Start: 3 5
-# Default-Stop: 0 1 2 6
-# Short-Description: puppetmaster
-# Description: Server for the puppet system management tool.
-### END INIT INFO
-
-# Shell functions sourced from /etc/rc.status:
-#      rc_check         check and set local and overall rc status
-#      rc_status        check and set local and overall rc status
-#      rc_status -v     ditto but be verbose in local rc status
-#      rc_status -v -r  ditto and clear the local rc status
-#      rc_failed        set local and overall rc status to failed
-#      rc_reset         clear local rc status (overall remains)
-#      rc_exit          exit appropriate to overall rc status
-
-lockfile=/var/lock/subsys/puppetmaster
-pidfile=/var/run/puppetlabs/master.pid
-
-# Source function library.
-[ -f /etc/rc.status ] && . /etc/rc.status
-
-if [ -f /etc/sysconfig/puppetmaster ]; then
-    . /etc/sysconfig/puppetmaster
-fi
-
-PUPPETMASTER_OPTS="master "
-[ -n "$PUPPETMASTER_MANIFEST" ] && PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --manifest=${PUPPETMASTER_MANIFEST}"
-[ -n "$PUPPETMASTER_PORTS" ] && PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --masterport=${PUPPETMASTER_PORTS[0]}"
-[ -n "$PUPPETMASTER_LOG" ] && PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --logdest ${PUPPETMASTER_LOG}"
-PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} \
-    ${PUPPETMASTER_EXTRA_OPTS}"
-
-RETVAL=0
-
-PUPPETMASTER=/usr/bin/puppet
-
-mongrel_warning="The mongrel servertype is no longer built-in to Puppet. It appears
-as though mongrel is being used, as the number of ports is greater than
-one. Starting the puppetmaster service will not behave as expected until this
-is resolved. Only the first port has been used in the service. These settings
-are defined at /etc/sysconfig/puppetmaster"
-
-# Warn about removed and unsupported mongrel servertype
-if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
-    echo $mongrel_warning
-    echo
-fi
-
-start() {
-    echo -n $"Starting puppetmaster: "
-
-    echo
-    return $RETVAL
-}
-
-# First reset status of this service
-rc_reset
-
-# Return values acc. to LSB for all commands but status:
-# 0 - success
-# 1 - misc error
-# 2 - invalid or excess args
-# 3 - unimplemented feature (e.g. reload)
-# 4 - insufficient privilege
-# 5 - program not installed
-# 6 - program not configured
-#
-# Note that starting an already running service, stopping
-# or restarting a not-running service as well as the restart
-# with force-reload (in case signalling is not supported) are
-# considered a success.
-
-case "$1" in
-    start)
-        echo -n "Starting puppetmaster services."
-        ## Start daemon with startproc(8). If this fails
-        ## the echo return value is set appropriate.
-
-        # startproc should return 0, even if service is
-        # already running to match LSB spec.
-        # Confirm the manifest exists
-        if [ -r $PUPPETMASTER_MANIFEST ]; then
-            startproc -p ${pidfile} $PUPPETMASTER $PUPPETMASTER_OPTS && touch "$lockfile"
-        else
-            rc_failed
-            echo "Manifest does not exist: $PUPPETMASTER_MANIFEST"
-        fi
-        # Remember status and be verbose
-        rc_status -v
-        ;;
-    stop)
-        echo -n "Shutting down puppetmaster:"
-        ## Stop daemon with killproc(8) and if this fails
-        ## set echo the echo return value.
-
-        killproc -QUIT -p ${pidfile} $PUPPETMASTER && rm -f ${lockfile} ${pidfile}
-
-        # Remember status and be verbose
-        rc_status -v
-        ;;
-    try-restart|condrestart)
-        ## Stop the service and if this succeeds (i.e. the
-        ## service was running before), start it again.
-        $0 status >/dev/null &&  $0 restart
-
-        # Remember status and be quiet
-        rc_status
-        ;;
-    restart)
-        ## Stop the service and regardless of whether it was
-        ## running or not, start it again.
-        $0 stop
-        $0 start
-
-        # Remember status and be quiet
-        rc_status
-        ;;
-    force-reload)
-        ## Signal the daemon to reload its config. Most daemons
-        ## do this on signal 1 (SIGHUP).
-        ## If it does not support it, restart.
-
-        echo -n "Reload service puppet"
-        ## if it supports it:
-        killproc -HUP -p ${pidfile} $PUPPETMASTER
-        rc_status -v
-        ;;
-    reload)
-        ## Like force-reload, but if daemon does not support
-        ## signalling, do nothing (!)
-
-        # If it supports signalling:
-        echo -n "Reload puppet services."
-        killproc -HUP -p ${pidfile} $PUPPETMASTER
-        rc_status -v
-        ;;
-    status)
-        echo -n "Checking for service puppetmaster: "
-        ## Check status with checkproc(8), if process is running
-        ## checkproc will return with exit status 0.
-
-        # Status has a slightly different for the status command:
-        # 0 - service running
-        # 1 - service dead, but /var/run/  pid  file exists
-        # 2 - service dead, but /var/lock/ lock file exists
-        # 3 - service not running
-
-        # NOTE: checkproc returns LSB compliant status values.
-        checkproc -p ${pidfile} $PUPPETMASTER
-        rc_status -v
-        ;;
-    *)
-        echo "Usage: $0 {start|stop|status|try-restart|condrestart|restart|force-reload|reload}"
-        exit 1
-esac
-rc_exit

data/ext/yaml_nodes.rb

@@ -1,105 +0,0 @@
-#!/usr/bin/ruby
-#
-# = Synopsis
-#
-# Use YAML files to provide external node support.
-#
-# = Usage
-#
-#   yaml-nodes <host>
-#
-# = Description
-#
-# This is a simple example external node script.  It allows you to maintain your
-# node information in yaml files, and it will find a given node's file and produce
-# it on stdout.  It has simple inheritance, in that a node can specify a parent
-# node, and the node will inherit that parent's classes and parameters.
-#
-# = Options
-#
-# help::
-#   Print this help message
-#
-# yamldir::
-#   Specify where the yaml is found.  Defaults to 'yaml' in the current directory.
-#
-# = License
-#   Copyright 2011 Luke Kanies
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       https://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-
-require 'yaml'
-require 'optparse'
-
-BASEDIR = Dir.chdir(File.dirname(__FILE__) + "/..") { Dir.getwd }
-
-options = {:yamldir => File.join(BASEDIR, "yaml")}
-OptionParser.new do |opts|
-  opts.banner = "Usage: yaml-nodes [options] <host>"
-
-  opts.on("-y dir", "--yamldir dir", "Specify the directory with the YAML files") do |arg|
-    raise "YAML directory #{arg} does not exist or is not a directory" unless FileTest.directory?(arg)
-    options[:yamldir] = arg
-  end
-
-  opts.on("-h", "--help", "Print this help") do
-    puts opts.help
-    exit(0)
-  end
-end.parse!
-
-# Read in a pure yaml representation of our node.
-def read_node(node)
-  nodefile = File.join(YAMLDIR, "#{node}.yaml")
-  if FileTest.exist?(nodefile)
-    return YAML.load_file(nodefile)
-  else
-    raise "Could not find information for #{node}"
-  end
-end
-
-node = ARGV[0]
-
-info = read_node(node)
-
-# Iterate over any provided parents, merging in there information.
-parents_seen = []
-while parent = info["parent"] #rubocop:disable Lint/AssignmentInCondition
-  raise "Found inheritance loop with parent #{parent}" if parents_seen.include?(parent)
-
-  parents_seen << parent
-
-  info.delete("parent")
-
-  parent_info = read_node(parent)
-
-  # Include any parent classes in our list.
-  if parent_info["classes"]
-    info["classes"] += parent_info["classes"]
-    info["classes"].uniq!
-  end
-
-  # And inherit parameters from our parent, while preferring our own values.
-  if parent_info["parameters"]
-    # When using Hash#merge, the hash being merged in wins, and we
-    # want the subnode parameters to be the parent node parameters.
-    info["parameters"] = parent_info["parameters"].merge(info["parameters"])
-  end
-
-  # Copy over any parent node name.
-  if parent_info["parent"]
-    info["parent"] = parent_info["parent"]
-  end
-end
-
-puts YAML.dump(info)

data/spec/unit/indirector/store_configs_spec.rb

@@ -1,7 +0,0 @@
-require 'spec_helper'
-
-require 'puppet/indirector/store_configs'
-
-describe Puppet::Indirector::StoreConfigs do
-  pending "REVISIT: creating an instance requires ludicrous amounts of stubbing, and there is relatively little to actually test here.  What to do?  Shared behaviours allow us to push down a lot of the testing into the implementation class tests anyhow..."
-end