Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
authorShawn Ferry <shawn.ferry@oracle.com>
Mon, 28 Nov 2016 16:54:02 -0800
changeset 7565 48aa82a0931f
parent 7564 f958607559a6
child 7566 34f2284a605f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0 19429313 address_object type should support vrrp addresses 19888183 publisher provider is applied on each puppet run 22125767 nsswitch provider missing ipnodes, protocols, printers 22126108 add process scheduler administration provider 22960016 Puppet needs a native way to set ZFS ACLs 23107546 race condition with smf provider and manifest-import 23119445 Upgrade Ruby Hiera to 3.2.0 23547788 Add ILB type to Puppet 23593229 rspec tests need to be written for solaris_providers boot_environment 23593308 rspec tests need to be written for solaris_providers ipmp_interface 23593316 rspec tests need to be written for solaris_providers protocol_properties 23593225 rspec tests need to be written for solaris_providers etherstub 23593319 rspec tests need to be written for solaris_providers vnic 23593310 puppet module rspec tests and validation for nsswitch 24674283 current puppet.stencil implementation restricts some valid puppet use cases 24680838 puppet agent failures should be visible to administrator via SMF interfaces 24681179 puppet's logadm.conf is pointing at wrong location for master, ignoring agent 24696742 puppet svccfg doesn't work for some value types 24696809 Puppet link aggregation modules cascading errors 24825868 Update to Puppet 4, Puppet 3 is EOL 24836004 '-' is valid in pkg mediator implementation 24836209 nis provider needs to support multiple securenets entries 24928890 keystone and horizon modules patches create invalid metadata.json 25022632 puppet ipmp_interface type should not validate interface existence 25022714 Puppet SMF service should not refresh on every apply operation 25225039 puppet svccfg should not declare a property absent if it does not match desired 25060925 puppet resource address_object generates invalid puppet code for dhcp interfaces 25065015 update puppet oracle-solaris_providers 2.0.0 25071521 puppet svccfg type should return a clear error if value is not provided 25071681 puppet dns resource generates invalid manifest 25071686 puppet resource ldap; Error: Could not run: No ability to determine if ldap... 25071690 puppet resource nis; Error: Could not run: No ability to determine if nis exists 25092384 puppet module files should be owned by root 25093408 puppet-solaris should be part of puppet again 25106150 Nis provider is not idempotent 25106155 DNS provider is not idempotent 25163776 puppet link_aggregation misunderstands 'address' -u output 25163791 puppet link_aggregation should use resource values instead of property_hash 25163815 puppet address_object errors and validations could be better 25163840 puppet Puppet::Property::List types conflict with internally generated arrays 25163864 puppet link_aggregation type specs need to be written 25177901 puppet beadm should not use both -e and -p 25178928 puppet link_aggregation should try to copy existing values on change of mode 25179040 puppet link_aggregation should delete with -t for temporary 25192742 puppet svccfg shouldn't try to update properties for a non-existent fmri 25196056 puppet interface and address _properties namevars are problematic 25191982 puppet type 'dns' is not able to set 'options' property in resolv.conf 25211935 puppet link_aggregation needs to permanently delete before modifying temporary 25217063 puppet protocol_properties is not idempotent 25218036 puppet resource svccfg emits a warning for every property 25218053 puppet svccfg prefetch should match individually specified parameters 25218208 puppet svccfg should enforce well-formedness in fmri parameters 25224661 puppet resource address_properties shouldn't output read-only properties 25224777 puppet address_properties should not reset unchanged properties 25306835 puppet boot_environment needs to understand the new snapshot format 25306877 puppet svccfg should check for pg and allow nested property groups 25306904 puppet dns,nis,ldap,protocol_properties prefetch fails after input auto munge 25348321 puppet boot_environment needs to validate all properties and parameters 25354751 puppet vnic provider needs to support / and - as valid vnic name characters
components/ruby/facter/facter.p5m file | annotate | diff | comparison | revisions
components/ruby/hiera/Makefile file | annotate | diff | comparison | revisions
components/ruby/hiera/hiera.license file | annotate | diff | comparison | revisions
components/ruby/hiera/hiera.p5m file | annotate | diff | comparison | revisions
components/ruby/hiera/patches/hiera-00-dependency.patch file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/nanliu-staging/nanliu-staging.p5m file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/openstack-cinder/openstack-cinder.p5m file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/openstack-glance/openstack-glance.p5m file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/openstack-heat/openstack-heat.p5m file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/openstack-horizon/openstack-horizon.p5m file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/openstack-horizon/patches/01-metadata.patch file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/openstack-ironic/openstack-ironic.p5m file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/openstack-keystone/openstack-keystone.p5m file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/openstack-keystone/patches/01-metadata.patch file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/openstack-neutron/openstack-neutron.p5m file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/openstack-nova/openstack-nova.p5m file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/openstack-openstacklib/openstack-openstacklib.p5m file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/openstack-swift/openstack-swift.p5m file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/openstack-vswitch/openstack-vswitch.p5m file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/oracle-solaris_providers/Makefile file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/oracle-solaris_providers/oracle-solaris_providers.p5m file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/puppetlabs-apache/puppetlabs-apache.p5m file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/puppetlabs-concat/puppetlabs-concat.p5m file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/puppetlabs-inifile/puppetlabs-inifile.p5m file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/puppetlabs-mysql/puppetlabs-mysql.p5m file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/puppetlabs-ntp/puppetlabs-ntp.p5m file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/puppetlabs-rabbitmq/puppetlabs-rabbitmq.p5m file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/puppetlabs-rsync/puppetlabs-rsync.p5m file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/puppetlabs-stdlib/puppetlabs-stdlib.p5m file | annotate | diff | comparison | revisions
components/ruby/puppet-modules/saz-memcached/saz-memcached.p5m file | annotate | diff | comparison | revisions
components/ruby/puppet-solaris/Makefile file | annotate | diff | comparison | revisions
components/ruby/puppet-solaris/ext/extconf.rb file | annotate | diff | comparison | revisions
components/ruby/puppet-solaris/ext/puppet_audit.c file | annotate | diff | comparison | revisions
components/ruby/puppet-solaris/files/auth_attr file | annotate | diff | comparison | revisions
components/ruby/puppet-solaris/files/exec_attr file | annotate | diff | comparison | revisions
components/ruby/puppet-solaris/files/prof_attr file | annotate | diff | comparison | revisions
components/ruby/puppet-solaris/files/puppet.logadm.conf file | annotate | diff | comparison | revisions
components/ruby/puppet-solaris/files/puppet.stencil file | annotate | diff | comparison | revisions
components/ruby/puppet-solaris/files/puppet.xml file | annotate | diff | comparison | revisions
components/ruby/puppet-solaris/files/update_smf.py file | annotate | diff | comparison | revisions
components/ruby/puppet-solaris/files/user_attr file | annotate | diff | comparison | revisions
components/ruby/puppet-solaris/puppet-solaris.p5m file | annotate | diff | comparison | revisions
components/ruby/puppet-solaris/puppet.license file | annotate | diff | comparison | revisions
components/ruby/puppet/Makefile file | annotate | diff | comparison | revisions
components/ruby/puppet/ext/extconf.rb file | annotate | diff | comparison | revisions
components/ruby/puppet/ext/puppet_audit.c file | annotate | diff | comparison | revisions
components/ruby/puppet/files/auth_attr file | annotate | diff | comparison | revisions
components/ruby/puppet/files/exec_attr file | annotate | diff | comparison | revisions
components/ruby/puppet/files/prof_attr file | annotate | diff | comparison | revisions
components/ruby/puppet/files/puppet.logadm.conf file | annotate | diff | comparison | revisions
components/ruby/puppet/files/puppet.stencil file | annotate | diff | comparison | revisions
components/ruby/puppet/files/puppet.xml file | annotate | diff | comparison | revisions
components/ruby/puppet/files/upgrade.sh file | annotate | diff | comparison | revisions
components/ruby/puppet/files/user_attr file | annotate | diff | comparison | revisions
components/ruby/puppet/history file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/0001-Puppet4-paths.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/puppet-00-PUP-6793-s12pkg.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/puppet-00-s12pkg.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/puppet-01-PUP-6795-installrb-nogzip-manpage.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/puppet-01-installrb-nogzip-manpage.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/puppet-02-zone-type.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/puppet-03-zone-provider.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/puppet-04-agent-auditing.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/puppet-05-apply-auditing.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/puppet-06-PUP-6797-provider-smf.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/puppet-06-provider-smf.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/puppet-07-PUP-2641.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/puppet-08-PUP-2509.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/puppet-09-PUP-6796-role-shell.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/puppet-09-role-shell.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/puppet-10-PUP-6792-smf-recursive-enable.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/puppet-10-smf-recursive-enable.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/puppet-11-smf-degraded.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/puppet-12-pkg-provider-latest.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/puppet-13-default-smf.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/puppet-13-smf-restartcmd.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/puppet-14-log-smf.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/puppet-14-smf-refreshable.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/puppet-15-shadow-bug.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/z-puppet-00.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/z-puppet-01.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/z-puppet-04.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/z-puppet-05.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/z-puppet-06.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/z-puppet-07.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/z-puppet-09.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/z-puppet-13.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/patches/z-puppet-14.patch file | annotate | diff | comparison | revisions
components/ruby/puppet/puppet.p5m file | annotate | diff | comparison | revisions
components/ruby/puppet/tools/update_smf.py file | annotate | diff | comparison | revisions
make-rules/prep-git.mk file | annotate | diff | comparison | revisions
make-rules/puppetmodule.mk file | annotate | diff | comparison | revisions 
--- a/components/ruby/facter/facter.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/facter/facter.p5m	Mon Nov 28 16:54:02 2016 -0800
@@ -36,7 +36,8 @@
     value="org.opensolaris.category.2008:System/Administration and Configuration"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2013/005 value=PSARC/2016/016
+set name=org.opensolaris.arc-caseid value=PSARC/2013/005 value=PSARC/2016/016 \
+    value=PSARC/2016/607
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 # Make facter available in /usr/bin
--- a/components/ruby/hiera/Makefile	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/hiera/Makefile	Mon Nov 28 16:54:02 2016 -0800
@@ -28,16 +28,16 @@
 RUBY_VERSIONS=2.1.0
 
 COMPONENT_NAME=		hiera
-COMPONENT_VERSION=	1.3.4
+COMPONENT_VERSION=  3.2.0
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).gem
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:a3c85385ddda64916d453efeeb965151dc2454428d88f04f40d539559af27020
+    sha256:39a5d7a14dafaf4745b1f660e7b78a80d2f2724ac89d467a092305c1eea5f576
 COMPONENT_ARCHIVE_URL=	http://rubygems.org/gems/$(COMPONENT_SRC).gem
-COMPONENT_PROJECT_URL=  https://github.com/puppetlabs/hiera	
+COMPONENT_PROJECT_URL=  https://github.com/puppetlabs/hiera
 COMPONENT_BUGDB=	utility/puppet
 
-TPNO=                   18210
+TPNO=                   30453
 
 # No gemspec is shipped with the gem. Create one
 COMPONENT_POST_UNPACK_ACTION= \
--- a/components/ruby/hiera/hiera.license	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/hiera/hiera.license	Mon Nov 28 16:54:02 2016 -0800
@@ -1,7 +1,6 @@
-
 Puppet - Automating Configuration Management.
 
-Copyright (C) 2012 Puppet Labs Inc.
+Copyright (C) 2012-2014 Puppet Labs Inc
 
 Puppet Labs can be contacted at: [email protected]
 
--- a/components/ruby/hiera/hiera.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/hiera/hiera.p5m	Mon Nov 28 16:54:02 2016 -0800
@@ -38,11 +38,13 @@
     value=org.opensolaris.category.2008:System/Databases
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2014/275 value=PSARC/2016/016
+set name=org.opensolaris.arc-caseid value=PSARC/2014/275 value=PSARC/2016/016 \
+    value=PSARC/2016/607
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 # Add a configuration file
-file files/hiera.yaml path=etc/hiera.yaml mode=0644 overlay=allow preserve=true
+file files/hiera.yaml path=etc/puppetlabs/puppet/hiera.yaml mode=0644 \
+    overlay=allow preserve=true
 
 # Make hiera available in /usr/bin
 link path=usr/bin/hiera \
@@ -51,6 +53,7 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/cache/hiera-$(COMPONENT_VERSION).gem
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/rdoc/Hiera.html
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/rdoc/Hiera/Backend.html
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/rdoc/Hiera/Backend/Backend1xWrapper.html
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/rdoc/Hiera/Backend/Json_backend.html
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/rdoc/Hiera/Backend/Yaml_backend.html
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/rdoc/Hiera/Config.html
@@ -59,6 +62,7 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/rdoc/Hiera/FallbackLogger.html
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/rdoc/Hiera/Filecache.html
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/rdoc/Hiera/Interpolate.html
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/rdoc/Hiera/InterpolationInvalidValue.html
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/rdoc/Hiera/InterpolationLoop.html
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/rdoc/Hiera/InvalidConfigurationError.html
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/rdoc/Hiera/Noop_logger.html
@@ -106,6 +110,9 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/rdoc/js/searcher.js
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/rdoc/rdoc.css
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/rdoc/table_of_contents.html
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Backend/Backend1xWrapper/cdesc-Backend1xWrapper.ri
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Backend/Backend1xWrapper/lookup-i.ri
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Backend/Backend1xWrapper/new-c.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Backend/Json_backend/cdesc-Json_backend.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Backend/Json_backend/lookup-i.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Backend/Json_backend/new-c.ri
@@ -120,10 +127,13 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Backend/datafile_in-i.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Backend/datasourcefiles-i.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Backend/datasources-i.ri
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Backend/find_backend-i.ri
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Backend/interpolate_config-i.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Backend/lookup-i.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Backend/merge_answer-i.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Backend/parse_answer-i.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Backend/parse_string-i.ri
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Backend/qualified_lookup-i.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Backend/resolve_answer-i.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Config/%5b%5d-i.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Config/cdesc-Config.ri
@@ -146,12 +156,15 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Filecache/read-i.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Filecache/read_file-i.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Filecache/stale%3f-i.ri
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Interpolate/alias_interpolate-i.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Interpolate/cdesc-Interpolate.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Interpolate/do_interpolation-i.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Interpolate/get_interpolation_method_and_key-i.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Interpolate/hiera_interpolate-i.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Interpolate/interpolate-i.ri
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Interpolate/literal_interpolate-i.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Interpolate/scope_interpolate-i.ri
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/InterpolationInvalidValue/cdesc-InterpolationInvalidValue.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/InterpolationLoop/cdesc-InterpolationLoop.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/InvalidConfigurationError/cdesc-InvalidConfigurationError.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Noop_logger/cdesc-Noop_logger.ri
@@ -165,11 +178,13 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/RecursiveGuard/check-i.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/RecursiveGuard/new-c.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Util/cdesc-Util.ri
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Util/code_dir-i.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Util/common_appdata-i.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Util/config_dir-i.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Util/file_alt_separator-i.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Util/microsoft_windows%3f-i.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Util/posix%3f-i.ri
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Util/split_key-i.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/Util/var_dir-i.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/cdesc-Hiera.ri
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/doc/hiera-$(COMPONENT_VERSION)/ri/Hiera/config-i.ri
@@ -211,12 +226,27 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/gems/hiera-$(COMPONENT_VERSION)/spec/unit/console_logger_spec.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/gems/hiera-$(COMPONENT_VERSION)/spec/unit/fallback_logger_spec.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/gems/hiera-$(COMPONENT_VERSION)/spec/unit/filecache_spec.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/gems/hiera-$(COMPONENT_VERSION)/spec/unit/fixtures/interpolate/config/hiera.yaml
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/gems/hiera-$(COMPONENT_VERSION)/spec/unit/fixtures/interpolate/config/hiera_iplm_hiera.yaml
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/gems/hiera-$(COMPONENT_VERSION)/spec/unit/fixtures/interpolate/config/hiera_iplm_hiera_bad.yaml
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/gems/hiera-$(COMPONENT_VERSION)/spec/unit/fixtures/interpolate/data/bad_interpolation.yaml
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/gems/hiera-$(COMPONENT_VERSION)/spec/unit/fixtures/interpolate/data/complex.yaml
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/gems/hiera-$(COMPONENT_VERSION)/spec/unit/fixtures/interpolate/data/dotted_keys.yaml
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/gems/hiera-$(COMPONENT_VERSION)/spec/unit/fixtures/interpolate/data/empty_interpolation.yaml
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/gems/hiera-$(COMPONENT_VERSION)/spec/unit/fixtures/interpolate/data/frontend.json
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/gems/hiera-$(COMPONENT_VERSION)/spec/unit/fixtures/interpolate/data/niltest.yaml
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/gems/hiera-$(COMPONENT_VERSION)/spec/unit/fixtures/interpolate/data/recursive.yaml
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/gems/hiera-$(COMPONENT_VERSION)/spec/unit/fixtures/interpolate/data/role.json
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/gems/hiera-$(COMPONENT_VERSION)/spec/unit/fixtures/interpolate/data/weird_keys.yaml
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/gems/hiera-$(COMPONENT_VERSION)/spec/unit/fixtures/override/config/hiera.yaml
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/gems/hiera-$(COMPONENT_VERSION)/spec/unit/fixtures/override/data/alternate.yaml
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/gems/hiera-$(COMPONENT_VERSION)/spec/unit/fixtures/override/data/common.yaml
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/gems/hiera-$(COMPONENT_VERSION)/spec/unit/hiera_spec.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/gems/hiera-$(COMPONENT_VERSION)/spec/unit/interpolate_spec.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/gems/hiera-$(COMPONENT_VERSION)/spec/unit/puppet_logger_spec.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/gems/hiera-$(COMPONENT_VERSION)/spec/unit/util_spec.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/gems/hiera-$(COMPONENT_VERSION)/spec/unit/version_spec.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/gems/$(RUBY_LIB_VERSION)/specifications/hiera-$(COMPONENT_VERSION).gemspec
-
 # Add man page
 file files/hiera.1 path=usr/share/man/man1/hiera.1
 
--- a/components/ruby/hiera/patches/hiera-00-dependency.patch	Wed Jan 11 15:24:27 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-Oracle customization - non upstream patch
-Modify hiera dependency to use json instead of json_pure
-
---- hiera-1.3.4/hiera.gemspec	Wed Dec  2 19:05:29 2015
-+++ hiera-1.3.4/hiera.gemspec.orig	Wed Dec  2 19:04:47 2015
-@@ -22,12 +22,12 @@
-     s.specification_version = 4
- 
-     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
--      s.add_runtime_dependency(%q<json_pure>, [">= 0"])
-+      s.add_runtime_dependency(%q<json>, [">= 0"])
-     else
--      s.add_dependency(%q<json_pure>, [">= 0"])
-+      s.add_dependency(%q<json>, [">= 0"])
-     end
-   else
--    s.add_dependency(%q<json_pure>, [">= 0"])
-+    s.add_dependency(%q<json>, [">= 0"])
-   end
- end
- 
--- a/components/ruby/puppet-modules/nanliu-staging/nanliu-staging.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet-modules/nanliu-staging/nanliu-staging.p5m	Mon Nov 28 16:54:02 2016 -0800
@@ -22,8 +22,6 @@
 #
 # Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
-<transform file dir -> default owner puppet>
-<transform file dir -> default group puppet>
 set name=pkg.fmri \
     value=pkg:/system/management/puppet/nanliu-staging@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Staging Puppet Module"
@@ -37,46 +35,47 @@
 set name=info.upstream \
     value="puppetlabs - https://forge.puppetlabs.com/puppetlabs"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2015/368 value=PSARC/2016/016
+set name=org.opensolaris.arc-caseid value=PSARC/2015/368 value=PSARC/2016/016 \
+    value=PSARC/2016/607
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file path=etc/puppet/modules/staging/Gemfile
-file path=etc/puppet/modules/staging/LICENSE
-file path=etc/puppet/modules/staging/README.md
-file path=etc/puppet/modules/staging/Rakefile
-file path=etc/puppet/modules/staging/Vagrantfile
-file path=etc/puppet/modules/staging/checksums.json
-file path=etc/puppet/modules/staging/docs/deploy.html
-file path=etc/puppet/modules/staging/docs/extract.html
-file path=etc/puppet/modules/staging/docs/file.html
-file path=etc/puppet/modules/staging/docs/init.html
-file path=etc/puppet/modules/staging/files/sample
-file path=etc/puppet/modules/staging/files/sample.tar.bz2
-file path=etc/puppet/modules/staging/files/sample.tar.gz
-file path=etc/puppet/modules/staging/lib/facter/staging_http_get.rb
-file path=etc/puppet/modules/staging/lib/facter/staging_windir.rb
-file path=etc/puppet/modules/staging/lib/puppet/parser/functions/scope_defaults.rb
-file path=etc/puppet/modules/staging/lib/puppet/parser/functions/staging_parse.rb
-file path=etc/puppet/modules/staging/manifests/.init.pp.swp
-file path=etc/puppet/modules/staging/manifests/deploy.pp
-file path=etc/puppet/modules/staging/manifests/extract.pp
-file path=etc/puppet/modules/staging/manifests/file.pp
-file path=etc/puppet/modules/staging/manifests/init.pp
-file path=etc/puppet/modules/staging/manifests/params.pp
-file path=etc/puppet/modules/staging/metadata.json
-file path=etc/puppet/modules/staging/spec/defines/staging_deploy_spec.rb
-file path=etc/puppet/modules/staging/spec/defines/staging_extract_spec.rb
-file path=etc/puppet/modules/staging/spec/defines/staging_file_spec.rb
-file path=etc/puppet/modules/staging/spec/fixtures/hiera.yaml
-file path=etc/puppet/modules/staging/spec/spec_helper.rb
-file path=etc/puppet/modules/staging/spec/unit/puppet/parser/functions/scope_defaults_spec.rb
-file path=etc/puppet/modules/staging/spec/unit/puppet/parser/functions/staging_parse_spec.rb
-file path=etc/puppet/modules/staging/tests/deploy.pp
-file path=etc/puppet/modules/staging/tests/extract.pp
-file path=etc/puppet/modules/staging/tests/file.pp
-file path=etc/puppet/modules/staging/tests/init.pp
-file path=etc/puppet/modules/staging/tests/scope_defaults.pp
-file path=etc/puppet/modules/staging/tests/staging_parse.pp
+file path=usr/puppetlabs/puppet/modules/staging/Gemfile
+file path=usr/puppetlabs/puppet/modules/staging/LICENSE
+file path=usr/puppetlabs/puppet/modules/staging/README.md
+file path=usr/puppetlabs/puppet/modules/staging/Rakefile
+file path=usr/puppetlabs/puppet/modules/staging/Vagrantfile
+file path=usr/puppetlabs/puppet/modules/staging/checksums.json
+file path=usr/puppetlabs/puppet/modules/staging/docs/deploy.html
+file path=usr/puppetlabs/puppet/modules/staging/docs/extract.html
+file path=usr/puppetlabs/puppet/modules/staging/docs/file.html
+file path=usr/puppetlabs/puppet/modules/staging/docs/init.html
+file path=usr/puppetlabs/puppet/modules/staging/files/sample
+file path=usr/puppetlabs/puppet/modules/staging/files/sample.tar.bz2
+file path=usr/puppetlabs/puppet/modules/staging/files/sample.tar.gz
+file path=usr/puppetlabs/puppet/modules/staging/lib/facter/staging_http_get.rb
+file path=usr/puppetlabs/puppet/modules/staging/lib/facter/staging_windir.rb
+file path=usr/puppetlabs/puppet/modules/staging/lib/puppet/parser/functions/scope_defaults.rb
+file path=usr/puppetlabs/puppet/modules/staging/lib/puppet/parser/functions/staging_parse.rb
+file path=usr/puppetlabs/puppet/modules/staging/manifests/.init.pp.swp
+file path=usr/puppetlabs/puppet/modules/staging/manifests/deploy.pp
+file path=usr/puppetlabs/puppet/modules/staging/manifests/extract.pp
+file path=usr/puppetlabs/puppet/modules/staging/manifests/file.pp
+file path=usr/puppetlabs/puppet/modules/staging/manifests/init.pp
+file path=usr/puppetlabs/puppet/modules/staging/manifests/params.pp
+file path=usr/puppetlabs/puppet/modules/staging/metadata.json
+file path=usr/puppetlabs/puppet/modules/staging/spec/defines/staging_deploy_spec.rb
+file path=usr/puppetlabs/puppet/modules/staging/spec/defines/staging_extract_spec.rb
+file path=usr/puppetlabs/puppet/modules/staging/spec/defines/staging_file_spec.rb
+file path=usr/puppetlabs/puppet/modules/staging/spec/fixtures/hiera.yaml
+file path=usr/puppetlabs/puppet/modules/staging/spec/spec_helper.rb
+file path=usr/puppetlabs/puppet/modules/staging/spec/unit/puppet/parser/functions/scope_defaults_spec.rb
+file path=usr/puppetlabs/puppet/modules/staging/spec/unit/puppet/parser/functions/staging_parse_spec.rb
+file path=usr/puppetlabs/puppet/modules/staging/tests/deploy.pp
+file path=usr/puppetlabs/puppet/modules/staging/tests/extract.pp
+file path=usr/puppetlabs/puppet/modules/staging/tests/file.pp
+file path=usr/puppetlabs/puppet/modules/staging/tests/init.pp
+file path=usr/puppetlabs/puppet/modules/staging/tests/scope_defaults.pp
+file path=usr/puppetlabs/puppet/modules/staging/tests/staging_parse.pp
 #
 license nanliu-staging.license license="Apache v2.0"
 # Renamed Package
--- a/components/ruby/puppet-modules/openstack-cinder/openstack-cinder.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet-modules/openstack-cinder/openstack-cinder.p5m	Mon Nov 28 16:54:02 2016 -0800
@@ -35,211 +35,211 @@
     value="org.opensolaris.category.2008:System/Enterprise Management"
 set name=info.upstream value="OpenStack <[email protected]>"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2016/001
+set name=org.opensolaris.arc-caseid value=PSARC/2016/001 value=PSARC/2016/607
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file path=etc/puppet/modules/cinder/CHANGELOG.md
-file path=etc/puppet/modules/cinder/Gemfile
-file path=etc/puppet/modules/cinder/LICENSE
-file path=etc/puppet/modules/cinder/README.md
-file path=etc/puppet/modules/cinder/Rakefile
-file path=etc/puppet/modules/cinder/checksums.json
-file path=etc/puppet/modules/cinder/examples/cinder_volume_with_pacemaker.pp
-file path=etc/puppet/modules/cinder/lib/puppet/provider/cinder.rb
-file path=etc/puppet/modules/cinder/lib/puppet/provider/cinder_api_paste_ini/ini_setting.rb
-file path=etc/puppet/modules/cinder/lib/puppet/provider/cinder_config/ini_setting.rb
-file path=etc/puppet/modules/cinder/lib/puppet/provider/cinder_type/openstack.rb
-file path=etc/puppet/modules/cinder/lib/puppet/type/cinder_api_paste_ini.rb
-file path=etc/puppet/modules/cinder/lib/puppet/type/cinder_config.rb
-file path=etc/puppet/modules/cinder/lib/puppet/type/cinder_type.rb
-file path=etc/puppet/modules/cinder/manifests/api.pp
-file path=etc/puppet/modules/cinder/manifests/backend/bdd.pp
-file path=etc/puppet/modules/cinder/manifests/backend/dellsc_iscsi.pp
-file path=etc/puppet/modules/cinder/manifests/backend/emc_vnx.pp
-file path=etc/puppet/modules/cinder/manifests/backend/eqlx.pp
-file path=etc/puppet/modules/cinder/manifests/backend/glusterfs.pp
-file path=etc/puppet/modules/cinder/manifests/backend/gpfs.pp
-file path=etc/puppet/modules/cinder/manifests/backend/hp3par_iscsi.pp
-file path=etc/puppet/modules/cinder/manifests/backend/iscsi.pp
-file path=etc/puppet/modules/cinder/manifests/backend/netapp.pp
-file path=etc/puppet/modules/cinder/manifests/backend/nexenta.pp
-file path=etc/puppet/modules/cinder/manifests/backend/nfs.pp
-file path=etc/puppet/modules/cinder/manifests/backend/pure.pp
-file path=etc/puppet/modules/cinder/manifests/backend/quobyte.pp
-file path=etc/puppet/modules/cinder/manifests/backend/rbd.pp
-file path=etc/puppet/modules/cinder/manifests/backend/san.pp
-file path=etc/puppet/modules/cinder/manifests/backend/solidfire.pp
-file path=etc/puppet/modules/cinder/manifests/backend/vmdk.pp
+file path=usr/puppetlabs/puppet/modules/cinder/CHANGELOG.md
+file path=usr/puppetlabs/puppet/modules/cinder/Gemfile
+file path=usr/puppetlabs/puppet/modules/cinder/LICENSE
+file path=usr/puppetlabs/puppet/modules/cinder/README.md
+file path=usr/puppetlabs/puppet/modules/cinder/Rakefile
+file path=usr/puppetlabs/puppet/modules/cinder/checksums.json
+file path=usr/puppetlabs/puppet/modules/cinder/examples/cinder_volume_with_pacemaker.pp
+file path=usr/puppetlabs/puppet/modules/cinder/lib/puppet/provider/cinder.rb
+file path=usr/puppetlabs/puppet/modules/cinder/lib/puppet/provider/cinder_api_paste_ini/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/cinder/lib/puppet/provider/cinder_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/cinder/lib/puppet/provider/cinder_type/openstack.rb
+file path=usr/puppetlabs/puppet/modules/cinder/lib/puppet/type/cinder_api_paste_ini.rb
+file path=usr/puppetlabs/puppet/modules/cinder/lib/puppet/type/cinder_config.rb
+file path=usr/puppetlabs/puppet/modules/cinder/lib/puppet/type/cinder_type.rb
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/api.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/backend/bdd.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/backend/dellsc_iscsi.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/backend/emc_vnx.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/backend/eqlx.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/backend/glusterfs.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/backend/gpfs.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/backend/hp3par_iscsi.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/backend/iscsi.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/backend/netapp.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/backend/nexenta.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/backend/nfs.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/backend/pure.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/backend/quobyte.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/backend/rbd.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/backend/san.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/backend/solidfire.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/backend/vmdk.pp
 file files/backend/zfs_fc.pp \
-    path=etc/puppet/modules/cinder/manifests/backend/zfs_fc.pp
+    path=usr/puppetlabs/puppet/modules/cinder/manifests/backend/zfs_fc.pp
 file files/backend/zfs_iscsi.pp \
-    path=etc/puppet/modules/cinder/manifests/backend/zfs_iscsi.pp
+    path=usr/puppetlabs/puppet/modules/cinder/manifests/backend/zfs_iscsi.pp
 file files/backend/zfs_nfs.pp \
-    path=etc/puppet/modules/cinder/manifests/backend/zfs_nfs.pp
+    path=usr/puppetlabs/puppet/modules/cinder/manifests/backend/zfs_nfs.pp
 file files/backend/zfs_volume.pp \
-    path=etc/puppet/modules/cinder/manifests/backend/zfs_volume.pp
+    path=usr/puppetlabs/puppet/modules/cinder/manifests/backend/zfs_volume.pp
 file files/backend/zfssa_iscsi.pp \
-    path=etc/puppet/modules/cinder/manifests/backend/zfssa_iscsi.pp
-file path=etc/puppet/modules/cinder/manifests/backends.pp
-file path=etc/puppet/modules/cinder/manifests/backup.pp
-file path=etc/puppet/modules/cinder/manifests/backup/ceph.pp
-file path=etc/puppet/modules/cinder/manifests/backup/nfs.pp
-file path=etc/puppet/modules/cinder/manifests/backup/swift.pp
-file path=etc/puppet/modules/cinder/manifests/ceilometer.pp
-file path=etc/puppet/modules/cinder/manifests/client.pp
-file path=etc/puppet/modules/cinder/manifests/config.pp
-file path=etc/puppet/modules/cinder/manifests/cron/db_purge.pp
-file path=etc/puppet/modules/cinder/manifests/db.pp
-file path=etc/puppet/modules/cinder/manifests/db/mysql.pp
-file path=etc/puppet/modules/cinder/manifests/db/postgresql.pp
-file path=etc/puppet/modules/cinder/manifests/db/sync.pp
-file path=etc/puppet/modules/cinder/manifests/glance.pp
-file path=etc/puppet/modules/cinder/manifests/init.pp
-file path=etc/puppet/modules/cinder/manifests/keystone/auth.pp
-file path=etc/puppet/modules/cinder/manifests/logging.pp
-file path=etc/puppet/modules/cinder/manifests/params.pp
-file path=etc/puppet/modules/cinder/manifests/policy.pp
-file path=etc/puppet/modules/cinder/manifests/qpid.pp
-file path=etc/puppet/modules/cinder/manifests/quota.pp
-file path=etc/puppet/modules/cinder/manifests/quota_set.pp
-file path=etc/puppet/modules/cinder/manifests/rabbitmq.pp
-file path=etc/puppet/modules/cinder/manifests/scheduler.pp
-file path=etc/puppet/modules/cinder/manifests/scheduler/filter.pp
-file path=etc/puppet/modules/cinder/manifests/setup_test_volume.pp
-file path=etc/puppet/modules/cinder/manifests/type.pp
-file path=etc/puppet/modules/cinder/manifests/type_set.pp
-file path=etc/puppet/modules/cinder/manifests/vmware.pp
-file path=etc/puppet/modules/cinder/manifests/volume.pp
-file path=etc/puppet/modules/cinder/manifests/volume/dellsc_iscsi.pp
-file path=etc/puppet/modules/cinder/manifests/volume/emc_vnx.pp
-file path=etc/puppet/modules/cinder/manifests/volume/eqlx.pp
-file path=etc/puppet/modules/cinder/manifests/volume/glusterfs.pp
-file path=etc/puppet/modules/cinder/manifests/volume/gpfs.pp
-file path=etc/puppet/modules/cinder/manifests/volume/hp3par_iscsi.pp
-file path=etc/puppet/modules/cinder/manifests/volume/iscsi.pp
-file path=etc/puppet/modules/cinder/manifests/volume/netapp.pp
-file path=etc/puppet/modules/cinder/manifests/volume/nexenta.pp
-file path=etc/puppet/modules/cinder/manifests/volume/nfs.pp
-file path=etc/puppet/modules/cinder/manifests/volume/pure.pp
-file path=etc/puppet/modules/cinder/manifests/volume/quobyte.pp
-file path=etc/puppet/modules/cinder/manifests/volume/rbd.pp
-file path=etc/puppet/modules/cinder/manifests/volume/san.pp
-file path=etc/puppet/modules/cinder/manifests/volume/solidfire.pp
-file path=etc/puppet/modules/cinder/manifests/volume/vmdk.pp
+    path=usr/puppetlabs/puppet/modules/cinder/manifests/backend/zfssa_iscsi.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/backends.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/backup.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/backup/ceph.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/backup/nfs.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/backup/swift.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/ceilometer.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/client.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/config.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/cron/db_purge.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/db.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/db/mysql.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/db/postgresql.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/db/sync.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/glance.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/init.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/keystone/auth.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/logging.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/params.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/policy.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/qpid.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/quota.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/quota_set.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/rabbitmq.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/scheduler.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/scheduler/filter.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/setup_test_volume.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/type.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/type_set.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/vmware.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/volume.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/volume/dellsc_iscsi.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/volume/emc_vnx.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/volume/eqlx.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/volume/glusterfs.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/volume/gpfs.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/volume/hp3par_iscsi.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/volume/iscsi.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/volume/netapp.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/volume/nexenta.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/volume/nfs.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/volume/pure.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/volume/quobyte.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/volume/rbd.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/volume/san.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/volume/solidfire.pp
+file path=usr/puppetlabs/puppet/modules/cinder/manifests/volume/vmdk.pp
 file files/volume/zfs_fc.pp \
-    path=etc/puppet/modules/cinder/manifests/volume/zfs_fc.pp
+    path=usr/puppetlabs/puppet/modules/cinder/manifests/volume/zfs_fc.pp
 file files/volume/zfs_iscsi.pp \
-    path=etc/puppet/modules/cinder/manifests/volume/zfs_iscsi.pp
+    path=usr/puppetlabs/puppet/modules/cinder/manifests/volume/zfs_iscsi.pp
 file files/volume/zfs_nfs.pp \
-    path=etc/puppet/modules/cinder/manifests/volume/zfs_nfs.pp
+    path=usr/puppetlabs/puppet/modules/cinder/manifests/volume/zfs_nfs.pp
 file files/volume/zfs_volume.pp \
-    path=etc/puppet/modules/cinder/manifests/volume/zfs_volume.pp
+    path=usr/puppetlabs/puppet/modules/cinder/manifests/volume/zfs_volume.pp
 file files/volume/zfssa_iscsi.pp \
-    path=etc/puppet/modules/cinder/manifests/volume/zfssa_iscsi.pp
-file path=etc/puppet/modules/cinder/metadata.json
-file path=etc/puppet/modules/cinder/releasenotes/notes/Test-volume-permissions-7ca9964fdb8491a2.yaml
-file path=etc/puppet/modules/cinder/releasenotes/notes/block_device_backend-877dc1cd0ffab684.yaml
-file path=etc/puppet/modules/cinder/releasenotes/notes/cinder_v3-aacaa1f385aab7c4.yaml
-file path=etc/puppet/modules/cinder/releasenotes/notes/deprecate_auth_params-e34ba5123cee9060.yaml
-file path=etc/puppet/modules/cinder/releasenotes/notes/deprecate_cluster_id-8d9838a9ef8932bf.yaml
-file path=etc/puppet/modules/cinder/releasenotes/notes/deprecate_liberty-192d873c0d039e21.yaml
-file path=etc/puppet/modules/cinder/releasenotes/notes/emc_vnx_driver-359208e3eeeaabf7.yaml
-file path=etc/puppet/modules/cinder/releasenotes/notes/fix_multiple_rbd-e70b48e788387fa8.yaml
-file path=etc/puppet/modules/cinder/releasenotes/notes/host_config-d58e1bb4c2aff303.yaml
-file path=etc/puppet/modules/cinder/releasenotes/notes/keystone-v3-support-cinder_type-09357cfcf7834e80.yaml
-file path=etc/puppet/modules/cinder/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
-file path=etc/puppet/modules/cinder/releasenotes/notes/pymysql-e57bf1f0289dd426.yaml
-file path=etc/puppet/modules/cinder/releasenotes/notes/remove_qpid-0b446db43fdea617.yaml
-file path=etc/puppet/modules/cinder/releasenotes/notes/solidfire_glance-e3bc65c5ff6a634d.yaml
-file path=etc/puppet/modules/cinder/releasenotes/notes/type_providers-4f316d6b119c4d38.yaml
-file path=etc/puppet/modules/cinder/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
-file path=etc/puppet/modules/cinder/releasenotes/source/_static/.placeholder
-file path=etc/puppet/modules/cinder/releasenotes/source/conf.py
-file path=etc/puppet/modules/cinder/releasenotes/source/index.rst
-file path=etc/puppet/modules/cinder/releasenotes/source/mitaka.rst
-file path=etc/puppet/modules/cinder/releasenotes/source/unreleased.rst
-file path=etc/puppet/modules/cinder/setup.cfg
-file path=etc/puppet/modules/cinder/setup.py
-file path=etc/puppet/modules/cinder/spec/acceptance/basic_cinder_spec.rb
-file path=etc/puppet/modules/cinder/spec/acceptance/nodesets/centos-70-x64.yml
-file path=etc/puppet/modules/cinder/spec/acceptance/nodesets/default.yml
-file path=etc/puppet/modules/cinder/spec/acceptance/nodesets/nodepool-centos7.yml
-file path=etc/puppet/modules/cinder/spec/acceptance/nodesets/nodepool-trusty.yml
-file path=etc/puppet/modules/cinder/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
-file path=etc/puppet/modules/cinder/spec/classes/cinder_api_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_backends_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_backup_ceph_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_backup_nfs_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_backup_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_backup_swift_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_ceilometer_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_client_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_cron_db_purge_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_db_mysql_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_db_postgresql_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_db_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_db_sync_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_glance_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_keystone_auth_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_logging_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_params_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_policy_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_quota_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_rabbitmq_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_scheduler_filter_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_scheduler_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_setup_test_volume_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_vmware_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_dellsc_iscsi_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_emc_vnx_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_eqlx_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_glusterfs_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_gpfs_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_hp3par_iscsi_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_iscsi_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_netapp_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_nexenta_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_nfs_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_pure_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_quobyte_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_rbd_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_san_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_solidfire_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_spec.rb
-file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_vmdk_spec.rb
-file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_bdd_spec.rb
-file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_dellsc_iscsi_spec.rb
-file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_emc_vnx_spec.rb
-file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_eqlx_spec.rb
-file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_glusterfs_spec.rb
-file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_gpfs_spec.rb
-file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_hp3par_iscsi_spec.rb
-file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_iscsi_spec.rb
-file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_netapp_spec.rb
-file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_nexenta_spec.rb
-file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_nfs_spec.rb
-file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_pure_spec.rb
-file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_quobyte_spec.rb
-file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_rbd_spec.rb
-file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_san_spec.rb
-file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_solidfire_spec.rb
-file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_vmdk_spec.rb
-file path=etc/puppet/modules/cinder/spec/defines/cinder_quota_set_spec.rb
-file path=etc/puppet/modules/cinder/spec/defines/cinder_type_set_spec.rb
-file path=etc/puppet/modules/cinder/spec/defines/cinder_type_spec.rb
-file path=etc/puppet/modules/cinder/spec/shared_examples.rb
-file path=etc/puppet/modules/cinder/spec/spec_helper.rb
-file path=etc/puppet/modules/cinder/spec/spec_helper_acceptance.rb
-file path=etc/puppet/modules/cinder/spec/unit/provider/cinder_api_paste_ini/ini_setting_spec.rb
-file path=etc/puppet/modules/cinder/spec/unit/provider/cinder_config/ini_setting_spec.rb
-file path=etc/puppet/modules/cinder/spec/unit/provider/cinder_spec.rb
-file path=etc/puppet/modules/cinder/spec/unit/provider/cinder_type/openstack_spec.rb
-file path=etc/puppet/modules/cinder/spec/unit/type/cinder_api_paste_spec.rb
-file path=etc/puppet/modules/cinder/spec/unit/type/cinder_config_spec.rb
-file path=etc/puppet/modules/cinder/spec/unit/type/cinder_type_spec.rb
-file path=etc/puppet/modules/cinder/test-requirements.txt
-file path=etc/puppet/modules/cinder/tox.ini
+    path=usr/puppetlabs/puppet/modules/cinder/manifests/volume/zfssa_iscsi.pp
+file path=usr/puppetlabs/puppet/modules/cinder/metadata.json
+file path=usr/puppetlabs/puppet/modules/cinder/releasenotes/notes/Test-volume-permissions-7ca9964fdb8491a2.yaml
+file path=usr/puppetlabs/puppet/modules/cinder/releasenotes/notes/block_device_backend-877dc1cd0ffab684.yaml
+file path=usr/puppetlabs/puppet/modules/cinder/releasenotes/notes/cinder_v3-aacaa1f385aab7c4.yaml
+file path=usr/puppetlabs/puppet/modules/cinder/releasenotes/notes/deprecate_auth_params-e34ba5123cee9060.yaml
+file path=usr/puppetlabs/puppet/modules/cinder/releasenotes/notes/deprecate_cluster_id-8d9838a9ef8932bf.yaml
+file path=usr/puppetlabs/puppet/modules/cinder/releasenotes/notes/deprecate_liberty-192d873c0d039e21.yaml
+file path=usr/puppetlabs/puppet/modules/cinder/releasenotes/notes/emc_vnx_driver-359208e3eeeaabf7.yaml
+file path=usr/puppetlabs/puppet/modules/cinder/releasenotes/notes/fix_multiple_rbd-e70b48e788387fa8.yaml
+file path=usr/puppetlabs/puppet/modules/cinder/releasenotes/notes/host_config-d58e1bb4c2aff303.yaml
+file path=usr/puppetlabs/puppet/modules/cinder/releasenotes/notes/keystone-v3-support-cinder_type-09357cfcf7834e80.yaml
+file path=usr/puppetlabs/puppet/modules/cinder/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
+file path=usr/puppetlabs/puppet/modules/cinder/releasenotes/notes/pymysql-e57bf1f0289dd426.yaml
+file path=usr/puppetlabs/puppet/modules/cinder/releasenotes/notes/remove_qpid-0b446db43fdea617.yaml
+file path=usr/puppetlabs/puppet/modules/cinder/releasenotes/notes/solidfire_glance-e3bc65c5ff6a634d.yaml
+file path=usr/puppetlabs/puppet/modules/cinder/releasenotes/notes/type_providers-4f316d6b119c4d38.yaml
+file path=usr/puppetlabs/puppet/modules/cinder/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
+file path=usr/puppetlabs/puppet/modules/cinder/releasenotes/source/_static/.placeholder
+file path=usr/puppetlabs/puppet/modules/cinder/releasenotes/source/conf.py
+file path=usr/puppetlabs/puppet/modules/cinder/releasenotes/source/index.rst
+file path=usr/puppetlabs/puppet/modules/cinder/releasenotes/source/mitaka.rst
+file path=usr/puppetlabs/puppet/modules/cinder/releasenotes/source/unreleased.rst
+file path=usr/puppetlabs/puppet/modules/cinder/setup.cfg
+file path=usr/puppetlabs/puppet/modules/cinder/setup.py
+file path=usr/puppetlabs/puppet/modules/cinder/spec/acceptance/basic_cinder_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/acceptance/nodesets/centos-70-x64.yml
+file path=usr/puppetlabs/puppet/modules/cinder/spec/acceptance/nodesets/default.yml
+file path=usr/puppetlabs/puppet/modules/cinder/spec/acceptance/nodesets/nodepool-centos7.yml
+file path=usr/puppetlabs/puppet/modules/cinder/spec/acceptance/nodesets/nodepool-trusty.yml
+file path=usr/puppetlabs/puppet/modules/cinder/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_api_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_backends_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_backup_ceph_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_backup_nfs_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_backup_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_backup_swift_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_ceilometer_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_client_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_cron_db_purge_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_db_mysql_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_db_postgresql_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_db_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_db_sync_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_glance_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_keystone_auth_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_logging_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_params_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_policy_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_quota_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_rabbitmq_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_scheduler_filter_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_scheduler_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_setup_test_volume_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_vmware_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_volume_dellsc_iscsi_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_volume_emc_vnx_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_volume_eqlx_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_volume_glusterfs_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_volume_gpfs_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_volume_hp3par_iscsi_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_volume_iscsi_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_volume_netapp_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_volume_nexenta_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_volume_nfs_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_volume_pure_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_volume_quobyte_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_volume_rbd_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_volume_san_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_volume_solidfire_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_volume_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/classes/cinder_volume_vmdk_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/defines/cinder_backend_bdd_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/defines/cinder_backend_dellsc_iscsi_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/defines/cinder_backend_emc_vnx_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/defines/cinder_backend_eqlx_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/defines/cinder_backend_glusterfs_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/defines/cinder_backend_gpfs_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/defines/cinder_backend_hp3par_iscsi_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/defines/cinder_backend_iscsi_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/defines/cinder_backend_netapp_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/defines/cinder_backend_nexenta_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/defines/cinder_backend_nfs_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/defines/cinder_backend_pure_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/defines/cinder_backend_quobyte_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/defines/cinder_backend_rbd_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/defines/cinder_backend_san_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/defines/cinder_backend_solidfire_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/defines/cinder_backend_vmdk_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/defines/cinder_quota_set_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/defines/cinder_type_set_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/defines/cinder_type_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/shared_examples.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/spec_helper.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/spec_helper_acceptance.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/unit/provider/cinder_api_paste_ini/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/unit/provider/cinder_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/unit/provider/cinder_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/unit/provider/cinder_type/openstack_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/unit/type/cinder_api_paste_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/unit/type/cinder_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/spec/unit/type/cinder_type_spec.rb
+file path=usr/puppetlabs/puppet/modules/cinder/test-requirements.txt
+file path=usr/puppetlabs/puppet/modules/cinder/tox.ini
 #
 license openstack-cinder.license license="Apache v2.0"
 
--- a/components/ruby/puppet-modules/openstack-glance/openstack-glance.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet-modules/openstack-glance/openstack-glance.p5m	Mon Nov 28 16:54:02 2016 -0800
@@ -35,158 +35,158 @@
     value="org.opensolaris.category.2008:System/Enterprise Management"
 set name=info.upstream value="OpenStack <[email protected]>"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2016/001
+set name=org.opensolaris.arc-caseid value=PSARC/2016/001 value=PSARC/2016/607
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file path=etc/puppet/modules/glance/CHANGELOG.md
-file path=etc/puppet/modules/glance/Gemfile
-file path=etc/puppet/modules/glance/LICENSE
-file path=etc/puppet/modules/glance/README.md
-file path=etc/puppet/modules/glance/Rakefile
-file path=etc/puppet/modules/glance/checksums.json
-file path=etc/puppet/modules/glance/examples/glance_multi_store.pp
-file path=etc/puppet/modules/glance/examples/glance_single_store.pp
-file path=etc/puppet/modules/glance/ext/glance.rb
-file path=etc/puppet/modules/glance/ext/glance.sh
-file path=etc/puppet/modules/glance/lib/puppet/provider/glance.rb
-file path=etc/puppet/modules/glance/lib/puppet/provider/glance_api_config/ini_setting.rb
-file path=etc/puppet/modules/glance/lib/puppet/provider/glance_api_paste_ini/ini_setting.rb
-file path=etc/puppet/modules/glance/lib/puppet/provider/glance_cache_config/ini_setting.rb
-file path=etc/puppet/modules/glance/lib/puppet/provider/glance_glare_config/ini_setting.rb
-file path=etc/puppet/modules/glance/lib/puppet/provider/glance_glare_paste_ini/ini_setting.rb
-file path=etc/puppet/modules/glance/lib/puppet/provider/glance_image/openstack.rb
-file path=etc/puppet/modules/glance/lib/puppet/provider/glance_registry_config/ini_setting.rb
-file path=etc/puppet/modules/glance/lib/puppet/provider/glance_registry_paste_ini/ini_setting.rb
-file path=etc/puppet/modules/glance/lib/puppet/provider/glance_swift_config/ini_setting.rb
-file path=etc/puppet/modules/glance/lib/puppet/type/glance_api_config.rb
-file path=etc/puppet/modules/glance/lib/puppet/type/glance_api_paste_ini.rb
-file path=etc/puppet/modules/glance/lib/puppet/type/glance_cache_config.rb
-file path=etc/puppet/modules/glance/lib/puppet/type/glance_glare_config.rb
-file path=etc/puppet/modules/glance/lib/puppet/type/glance_glare_paste_ini.rb
-file path=etc/puppet/modules/glance/lib/puppet/type/glance_image.rb
-file path=etc/puppet/modules/glance/lib/puppet/type/glance_registry_config.rb
-file path=etc/puppet/modules/glance/lib/puppet/type/glance_registry_paste_ini.rb
-file path=etc/puppet/modules/glance/lib/puppet/type/glance_swift_config.rb
-file path=etc/puppet/modules/glance/manifests/api.pp
-file path=etc/puppet/modules/glance/manifests/api/db.pp
-file path=etc/puppet/modules/glance/manifests/api/logging.pp
-file path=etc/puppet/modules/glance/manifests/backend/cinder.pp
-file path=etc/puppet/modules/glance/manifests/backend/file.pp
-file path=etc/puppet/modules/glance/manifests/backend/rbd.pp
-file path=etc/puppet/modules/glance/manifests/backend/s3.pp
-file path=etc/puppet/modules/glance/manifests/backend/swift.pp
-file path=etc/puppet/modules/glance/manifests/backend/vsphere.pp
-file path=etc/puppet/modules/glance/manifests/cache/cleaner.pp
-file path=etc/puppet/modules/glance/manifests/cache/logging.pp
-file path=etc/puppet/modules/glance/manifests/cache/pruner.pp
-file path=etc/puppet/modules/glance/manifests/client.pp
-file path=etc/puppet/modules/glance/manifests/config.pp
-file path=etc/puppet/modules/glance/manifests/db/mysql.pp
-file path=etc/puppet/modules/glance/manifests/db/postgresql.pp
-file path=etc/puppet/modules/glance/manifests/db/sync.pp
-file path=etc/puppet/modules/glance/manifests/glare.pp
-file path=etc/puppet/modules/glance/manifests/glare/db.pp
-file path=etc/puppet/modules/glance/manifests/glare/logging.pp
-file path=etc/puppet/modules/glance/manifests/init.pp
-file path=etc/puppet/modules/glance/manifests/keystone/auth.pp
-file path=etc/puppet/modules/glance/manifests/keystone/glare_auth.pp
-file path=etc/puppet/modules/glance/manifests/notify/qpid.pp
-file path=etc/puppet/modules/glance/manifests/notify/rabbitmq.pp
-file path=etc/puppet/modules/glance/manifests/params.pp
-file path=etc/puppet/modules/glance/manifests/policy.pp
-file path=etc/puppet/modules/glance/manifests/registry.pp
-file path=etc/puppet/modules/glance/manifests/registry/db.pp
-file path=etc/puppet/modules/glance/manifests/registry/logging.pp
-file path=etc/puppet/modules/glance/metadata.json
-file path=etc/puppet/modules/glance/releasenotes/notes/deprecate_old_vsphere_backend_parameters-8d798bd64b750911.yaml
-file path=etc/puppet/modules/glance/releasenotes/notes/glance-image-id-d1a32b5ec443611e.yaml
-file path=etc/puppet/modules/glance/releasenotes/notes/glance-swift-v3-572d506977688377.yaml
-file path=etc/puppet/modules/glance/releasenotes/notes/glance_cache_logging-1f53fc9d71d04686.yaml
-file path=etc/puppet/modules/glance/releasenotes/notes/glance_db_class-dee87f87e25d0040.yaml
-file path=etc/puppet/modules/glance/releasenotes/notes/glance_glare_service-2cd8231e1e7d097b.yaml
-file path=etc/puppet/modules/glance/releasenotes/notes/ipv6_registry-95b934a99a6f2639.yaml
-file path=etc/puppet/modules/glance/releasenotes/notes/keystone_python_depr-80fa804d9cd242c5.yaml
-file path=etc/puppet/modules/glance/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
-file path=etc/puppet/modules/glance/releasenotes/notes/multi_store-d53d0e440b55e9d6.yaml
-file path=etc/puppet/modules/glance/releasenotes/notes/new_service_name-307a5803a248d2a3.yaml
-file path=etc/puppet/modules/glance/releasenotes/notes/pymysql-e57bf1f0289dd426.yaml
-file path=etc/puppet/modules/glance/releasenotes/notes/registry_ssl-eed9bdc67c795cde.yaml
-file path=etc/puppet/modules/glance/releasenotes/notes/remove_cluster_id-da63a8f698b27cec.yaml
-file path=etc/puppet/modules/glance/releasenotes/notes/remove_old_auth-d9fc4af8e2ced291.yaml
-file path=etc/puppet/modules/glance/releasenotes/notes/remove_posix-d1f775df21874348.yaml
-file path=etc/puppet/modules/glance/releasenotes/notes/remove_qpid-0b446db43fdea617.yaml
-file path=etc/puppet/modules/glance/releasenotes/notes/update_swift-52dfa8715cddbe91.yaml
-file path=etc/puppet/modules/glance/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
-file path=etc/puppet/modules/glance/releasenotes/source/_static/.placeholder
-file path=etc/puppet/modules/glance/releasenotes/source/conf.py
-file path=etc/puppet/modules/glance/releasenotes/source/index.rst
-file path=etc/puppet/modules/glance/releasenotes/source/mitaka.rst
-file path=etc/puppet/modules/glance/releasenotes/source/unreleased.rst
-file path=etc/puppet/modules/glance/setup.cfg
-file path=etc/puppet/modules/glance/setup.py
-file path=etc/puppet/modules/glance/spec/acceptance/basic_glance_spec.rb
-file path=etc/puppet/modules/glance/spec/acceptance/glance_config_spec.rb
-file path=etc/puppet/modules/glance/spec/acceptance/nodesets/centos-70-x64.yml
-file path=etc/puppet/modules/glance/spec/acceptance/nodesets/default.yml
-file path=etc/puppet/modules/glance/spec/acceptance/nodesets/nodepool-centos7.yml
-file path=etc/puppet/modules/glance/spec/acceptance/nodesets/nodepool-trusty.yml
-file path=etc/puppet/modules/glance/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
-file path=etc/puppet/modules/glance/spec/classes/glance_api_db_spec.rb
-file path=etc/puppet/modules/glance/spec/classes/glance_api_logging_spec.rb
-file path=etc/puppet/modules/glance/spec/classes/glance_api_spec.rb
-file path=etc/puppet/modules/glance/spec/classes/glance_backend_cinder_spec.rb
-file path=etc/puppet/modules/glance/spec/classes/glance_backend_file_spec.rb
-file path=etc/puppet/modules/glance/spec/classes/glance_backend_rbd_spec.rb
-file path=etc/puppet/modules/glance/spec/classes/glance_backend_s3_spec.rb
-file path=etc/puppet/modules/glance/spec/classes/glance_backend_swift_spec.rb
-file path=etc/puppet/modules/glance/spec/classes/glance_backend_vsphere_spec.rb
-file path=etc/puppet/modules/glance/spec/classes/glance_cache_cleaner_spec.rb
-file path=etc/puppet/modules/glance/spec/classes/glance_cache_logging_spec.rb
-file path=etc/puppet/modules/glance/spec/classes/glance_cache_pruner_spec.rb
-file path=etc/puppet/modules/glance/spec/classes/glance_client_spec.rb
-file path=etc/puppet/modules/glance/spec/classes/glance_config_spec.rb
-file path=etc/puppet/modules/glance/spec/classes/glance_db_mysql_spec.rb
-file path=etc/puppet/modules/glance/spec/classes/glance_db_postgresql_spec.rb
-file path=etc/puppet/modules/glance/spec/classes/glance_db_sync_spec.rb
-file path=etc/puppet/modules/glance/spec/classes/glance_glare_db_spec.rb
-file path=etc/puppet/modules/glance/spec/classes/glance_glare_logging_spec.rb
-file path=etc/puppet/modules/glance/spec/classes/glance_glare_spec.rb
-file path=etc/puppet/modules/glance/spec/classes/glance_keystone_auth_spec.rb
-file path=etc/puppet/modules/glance/spec/classes/glance_keystone_glare_auth_spec.rb
-file path=etc/puppet/modules/glance/spec/classes/glance_notify_rabbitmq_spec.rb
-file path=etc/puppet/modules/glance/spec/classes/glance_policy_spec.rb
-file path=etc/puppet/modules/glance/spec/classes/glance_registry_db_spec.rb
-file path=etc/puppet/modules/glance/spec/classes/glance_registry_logging_spec.rb
-file path=etc/puppet/modules/glance/spec/classes/glance_registry_spec.rb
-file path=etc/puppet/modules/glance/spec/classes/glance_spec.rb
-file path=etc/puppet/modules/glance/spec/shared_examples.rb
-file path=etc/puppet/modules/glance/spec/spec.opts
-file path=etc/puppet/modules/glance/spec/spec_helper.rb
-file path=etc/puppet/modules/glance/spec/spec_helper_acceptance.rb
-file path=etc/puppet/modules/glance/spec/unit/provider/glance_api_config/ini_setting_spec.rb
-file path=etc/puppet/modules/glance/spec/unit/provider/glance_api_paste_ini/ini_setting_spec.rb
-file path=etc/puppet/modules/glance/spec/unit/provider/glance_cache_config/ini_setting_spec.rb
-file path=etc/puppet/modules/glance/spec/unit/provider/glance_glare_config/ini_setting_spec.rb
-file path=etc/puppet/modules/glance/spec/unit/provider/glance_glare_paste_ini/ini_setting_spec.rb
-file path=etc/puppet/modules/glance/spec/unit/provider/glance_image_spec.rb
-file path=etc/puppet/modules/glance/spec/unit/provider/glance_registry_config/ini_setting_spec.rb
-file path=etc/puppet/modules/glance/spec/unit/provider/glance_registry_paste_ini/ini_setting_spec.rb
-file path=etc/puppet/modules/glance/spec/unit/provider/glance_spec.rb
-file path=etc/puppet/modules/glance/spec/unit/provider/glance_swift_config/ini_setting_spec.rb
-file path=etc/puppet/modules/glance/spec/unit/type/glance_api_config_spec.rb
-file path=etc/puppet/modules/glance/spec/unit/type/glance_api_paste_ini_spec.rb
-file path=etc/puppet/modules/glance/spec/unit/type/glance_cache_config_spec.rb
-file path=etc/puppet/modules/glance/spec/unit/type/glance_glare_config_spec.rb
-file path=etc/puppet/modules/glance/spec/unit/type/glance_glare_paste_ini_spec.rb
-file path=etc/puppet/modules/glance/spec/unit/type/glance_registry_config_spec.rb
-file path=etc/puppet/modules/glance/spec/unit/type/glance_registry_paste_ini_spec.rb
-file path=etc/puppet/modules/glance/spec/unit/type/glance_swift_config_spec.rb
-file path=etc/puppet/modules/glance/test-requirements.txt
-file path=etc/puppet/modules/glance/tests/api.pp
-file path=etc/puppet/modules/glance/tests/init.pp
-file path=etc/puppet/modules/glance/tests/registry.pp
-file path=etc/puppet/modules/glance/tests/site.pp
-file path=etc/puppet/modules/glance/tox.ini
+file path=usr/puppetlabs/puppet/modules/glance/CHANGELOG.md
+file path=usr/puppetlabs/puppet/modules/glance/Gemfile
+file path=usr/puppetlabs/puppet/modules/glance/LICENSE
+file path=usr/puppetlabs/puppet/modules/glance/README.md
+file path=usr/puppetlabs/puppet/modules/glance/Rakefile
+file path=usr/puppetlabs/puppet/modules/glance/checksums.json
+file path=usr/puppetlabs/puppet/modules/glance/examples/glance_multi_store.pp
+file path=usr/puppetlabs/puppet/modules/glance/examples/glance_single_store.pp
+file path=usr/puppetlabs/puppet/modules/glance/ext/glance.rb
+file path=usr/puppetlabs/puppet/modules/glance/ext/glance.sh
+file path=usr/puppetlabs/puppet/modules/glance/lib/puppet/provider/glance.rb
+file path=usr/puppetlabs/puppet/modules/glance/lib/puppet/provider/glance_api_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/glance/lib/puppet/provider/glance_api_paste_ini/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/glance/lib/puppet/provider/glance_cache_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/glance/lib/puppet/provider/glance_glare_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/glance/lib/puppet/provider/glance_glare_paste_ini/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/glance/lib/puppet/provider/glance_image/openstack.rb
+file path=usr/puppetlabs/puppet/modules/glance/lib/puppet/provider/glance_registry_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/glance/lib/puppet/provider/glance_registry_paste_ini/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/glance/lib/puppet/provider/glance_swift_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/glance/lib/puppet/type/glance_api_config.rb
+file path=usr/puppetlabs/puppet/modules/glance/lib/puppet/type/glance_api_paste_ini.rb
+file path=usr/puppetlabs/puppet/modules/glance/lib/puppet/type/glance_cache_config.rb
+file path=usr/puppetlabs/puppet/modules/glance/lib/puppet/type/glance_glare_config.rb
+file path=usr/puppetlabs/puppet/modules/glance/lib/puppet/type/glance_glare_paste_ini.rb
+file path=usr/puppetlabs/puppet/modules/glance/lib/puppet/type/glance_image.rb
+file path=usr/puppetlabs/puppet/modules/glance/lib/puppet/type/glance_registry_config.rb
+file path=usr/puppetlabs/puppet/modules/glance/lib/puppet/type/glance_registry_paste_ini.rb
+file path=usr/puppetlabs/puppet/modules/glance/lib/puppet/type/glance_swift_config.rb
+file path=usr/puppetlabs/puppet/modules/glance/manifests/api.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/api/db.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/api/logging.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/backend/cinder.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/backend/file.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/backend/rbd.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/backend/s3.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/backend/swift.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/backend/vsphere.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/cache/cleaner.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/cache/logging.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/cache/pruner.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/client.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/config.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/db/mysql.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/db/postgresql.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/db/sync.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/glare.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/glare/db.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/glare/logging.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/init.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/keystone/auth.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/keystone/glare_auth.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/notify/qpid.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/notify/rabbitmq.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/params.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/policy.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/registry.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/registry/db.pp
+file path=usr/puppetlabs/puppet/modules/glance/manifests/registry/logging.pp
+file path=usr/puppetlabs/puppet/modules/glance/metadata.json
+file path=usr/puppetlabs/puppet/modules/glance/releasenotes/notes/deprecate_old_vsphere_backend_parameters-8d798bd64b750911.yaml
+file path=usr/puppetlabs/puppet/modules/glance/releasenotes/notes/glance-image-id-d1a32b5ec443611e.yaml
+file path=usr/puppetlabs/puppet/modules/glance/releasenotes/notes/glance-swift-v3-572d506977688377.yaml
+file path=usr/puppetlabs/puppet/modules/glance/releasenotes/notes/glance_cache_logging-1f53fc9d71d04686.yaml
+file path=usr/puppetlabs/puppet/modules/glance/releasenotes/notes/glance_db_class-dee87f87e25d0040.yaml
+file path=usr/puppetlabs/puppet/modules/glance/releasenotes/notes/glance_glare_service-2cd8231e1e7d097b.yaml
+file path=usr/puppetlabs/puppet/modules/glance/releasenotes/notes/ipv6_registry-95b934a99a6f2639.yaml
+file path=usr/puppetlabs/puppet/modules/glance/releasenotes/notes/keystone_python_depr-80fa804d9cd242c5.yaml
+file path=usr/puppetlabs/puppet/modules/glance/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
+file path=usr/puppetlabs/puppet/modules/glance/releasenotes/notes/multi_store-d53d0e440b55e9d6.yaml
+file path=usr/puppetlabs/puppet/modules/glance/releasenotes/notes/new_service_name-307a5803a248d2a3.yaml
+file path=usr/puppetlabs/puppet/modules/glance/releasenotes/notes/pymysql-e57bf1f0289dd426.yaml
+file path=usr/puppetlabs/puppet/modules/glance/releasenotes/notes/registry_ssl-eed9bdc67c795cde.yaml
+file path=usr/puppetlabs/puppet/modules/glance/releasenotes/notes/remove_cluster_id-da63a8f698b27cec.yaml
+file path=usr/puppetlabs/puppet/modules/glance/releasenotes/notes/remove_old_auth-d9fc4af8e2ced291.yaml
+file path=usr/puppetlabs/puppet/modules/glance/releasenotes/notes/remove_posix-d1f775df21874348.yaml
+file path=usr/puppetlabs/puppet/modules/glance/releasenotes/notes/remove_qpid-0b446db43fdea617.yaml
+file path=usr/puppetlabs/puppet/modules/glance/releasenotes/notes/update_swift-52dfa8715cddbe91.yaml
+file path=usr/puppetlabs/puppet/modules/glance/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
+file path=usr/puppetlabs/puppet/modules/glance/releasenotes/source/_static/.placeholder
+file path=usr/puppetlabs/puppet/modules/glance/releasenotes/source/conf.py
+file path=usr/puppetlabs/puppet/modules/glance/releasenotes/source/index.rst
+file path=usr/puppetlabs/puppet/modules/glance/releasenotes/source/mitaka.rst
+file path=usr/puppetlabs/puppet/modules/glance/releasenotes/source/unreleased.rst
+file path=usr/puppetlabs/puppet/modules/glance/setup.cfg
+file path=usr/puppetlabs/puppet/modules/glance/setup.py
+file path=usr/puppetlabs/puppet/modules/glance/spec/acceptance/basic_glance_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/acceptance/glance_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/acceptance/nodesets/centos-70-x64.yml
+file path=usr/puppetlabs/puppet/modules/glance/spec/acceptance/nodesets/default.yml
+file path=usr/puppetlabs/puppet/modules/glance/spec/acceptance/nodesets/nodepool-centos7.yml
+file path=usr/puppetlabs/puppet/modules/glance/spec/acceptance/nodesets/nodepool-trusty.yml
+file path=usr/puppetlabs/puppet/modules/glance/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+file path=usr/puppetlabs/puppet/modules/glance/spec/classes/glance_api_db_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/classes/glance_api_logging_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/classes/glance_api_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/classes/glance_backend_cinder_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/classes/glance_backend_file_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/classes/glance_backend_rbd_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/classes/glance_backend_s3_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/classes/glance_backend_swift_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/classes/glance_backend_vsphere_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/classes/glance_cache_cleaner_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/classes/glance_cache_logging_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/classes/glance_cache_pruner_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/classes/glance_client_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/classes/glance_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/classes/glance_db_mysql_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/classes/glance_db_postgresql_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/classes/glance_db_sync_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/classes/glance_glare_db_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/classes/glance_glare_logging_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/classes/glance_glare_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/classes/glance_keystone_auth_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/classes/glance_keystone_glare_auth_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/classes/glance_notify_rabbitmq_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/classes/glance_policy_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/classes/glance_registry_db_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/classes/glance_registry_logging_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/classes/glance_registry_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/classes/glance_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/shared_examples.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/spec.opts
+file path=usr/puppetlabs/puppet/modules/glance/spec/spec_helper.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/spec_helper_acceptance.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/unit/provider/glance_api_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/unit/provider/glance_api_paste_ini/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/unit/provider/glance_cache_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/unit/provider/glance_glare_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/unit/provider/glance_glare_paste_ini/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/unit/provider/glance_image_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/unit/provider/glance_registry_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/unit/provider/glance_registry_paste_ini/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/unit/provider/glance_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/unit/provider/glance_swift_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/unit/type/glance_api_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/unit/type/glance_api_paste_ini_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/unit/type/glance_cache_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/unit/type/glance_glare_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/unit/type/glance_glare_paste_ini_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/unit/type/glance_registry_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/unit/type/glance_registry_paste_ini_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/spec/unit/type/glance_swift_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/glance/test-requirements.txt
+file path=usr/puppetlabs/puppet/modules/glance/tests/api.pp
+file path=usr/puppetlabs/puppet/modules/glance/tests/init.pp
+file path=usr/puppetlabs/puppet/modules/glance/tests/registry.pp
+file path=usr/puppetlabs/puppet/modules/glance/tests/site.pp
+file path=usr/puppetlabs/puppet/modules/glance/tox.ini
 #
 license openstack-glance.license license="Apache v2.0"
 
--- a/components/ruby/puppet-modules/openstack-heat/openstack-heat.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet-modules/openstack-heat/openstack-heat.p5m	Mon Nov 28 16:54:02 2016 -0800
@@ -35,87 +35,87 @@
     value="org.opensolaris.category.2008:System/Enterprise Management"
 set name=info.upstream value="OpenStack <[email protected]>"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2016/001
+set name=org.opensolaris.arc-caseid value=PSARC/2016/001 value=PSARC/2016/607
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file path=etc/puppet/modules/heat/CHANGELOG.md
-file path=etc/puppet/modules/heat/Gemfile
-file path=etc/puppet/modules/heat/LICENSE
-file path=etc/puppet/modules/heat/README.md
-file path=etc/puppet/modules/heat/Rakefile
-file path=etc/puppet/modules/heat/checksums.json
-file path=etc/puppet/modules/heat/examples/site.pp
-file path=etc/puppet/modules/heat/lib/puppet/provider/heat_api_paste_ini/ini_setting.rb
-file path=etc/puppet/modules/heat/lib/puppet/provider/heat_config/ini_setting.rb
-file path=etc/puppet/modules/heat/lib/puppet/type/heat_api_paste_ini.rb
-file path=etc/puppet/modules/heat/lib/puppet/type/heat_config.rb
-file path=etc/puppet/modules/heat/manifests/api.pp
-file path=etc/puppet/modules/heat/manifests/api_cfn.pp
-file path=etc/puppet/modules/heat/manifests/api_cloudwatch.pp
-file path=etc/puppet/modules/heat/manifests/client.pp
-file path=etc/puppet/modules/heat/manifests/config.pp
-file path=etc/puppet/modules/heat/manifests/cron/purge_deleted.pp
-file path=etc/puppet/modules/heat/manifests/db.pp
-file path=etc/puppet/modules/heat/manifests/db/mysql.pp
-file path=etc/puppet/modules/heat/manifests/db/postgresql.pp
-file path=etc/puppet/modules/heat/manifests/db/sync.pp
-file path=etc/puppet/modules/heat/manifests/deps.pp
-file path=etc/puppet/modules/heat/manifests/engine.pp
-file path=etc/puppet/modules/heat/manifests/init.pp
-file path=etc/puppet/modules/heat/manifests/keystone/auth.pp
-file path=etc/puppet/modules/heat/manifests/keystone/auth_cfn.pp
-file path=etc/puppet/modules/heat/manifests/keystone/domain.pp
-file path=etc/puppet/modules/heat/manifests/logging.pp
-file path=etc/puppet/modules/heat/manifests/params.pp
-file path=etc/puppet/modules/heat/manifests/policy.pp
-file path=etc/puppet/modules/heat/metadata.json
-file path=etc/puppet/modules/heat/releasenotes/notes/api_paste-b94e191896840944.yaml
-file path=etc/puppet/modules/heat/releasenotes/notes/crontab_purge-89f321e9cf966933.yaml
-file path=etc/puppet/modules/heat/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
-file path=etc/puppet/modules/heat/releasenotes/notes/pymysql-e57bf1f0289dd426.yaml
-file path=etc/puppet/modules/heat/releasenotes/notes/remove_qpid-0b446db43fdea617.yaml
-file path=etc/puppet/modules/heat/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
-file path=etc/puppet/modules/heat/releasenotes/notes/versionless-auth-urls-08c741084b9a9040.yaml
-file path=etc/puppet/modules/heat/releasenotes/source/_static/.placeholder
-file path=etc/puppet/modules/heat/releasenotes/source/conf.py
-file path=etc/puppet/modules/heat/releasenotes/source/index.rst
-file path=etc/puppet/modules/heat/releasenotes/source/mitaka.rst
-file path=etc/puppet/modules/heat/releasenotes/source/unreleased.rst
-file path=etc/puppet/modules/heat/setup.cfg
-file path=etc/puppet/modules/heat/setup.py
-file path=etc/puppet/modules/heat/spec/acceptance/basic_heat_spec.rb
-file path=etc/puppet/modules/heat/spec/acceptance/nodesets/centos-70-x64.yml
-file path=etc/puppet/modules/heat/spec/acceptance/nodesets/default.yml
-file path=etc/puppet/modules/heat/spec/acceptance/nodesets/nodepool-centos7.yml
-file path=etc/puppet/modules/heat/spec/acceptance/nodesets/nodepool-trusty.yml
-file path=etc/puppet/modules/heat/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
-file path=etc/puppet/modules/heat/spec/classes/heat_api_cfn_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_api_cloudwatch_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_api_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_client_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_config_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_cron_purge_deleted_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_db_mysql_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_db_postgresql_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_db_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_db_sync_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_deps_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_engine_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_init_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_keystone_auth_cfn_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_keystone_auth_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_keystone_domain_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_logging_spec.rb
-file path=etc/puppet/modules/heat/spec/classes/heat_policy_spec.rb
-file path=etc/puppet/modules/heat/spec/shared_examples.rb
-file path=etc/puppet/modules/heat/spec/spec_helper.rb
-file path=etc/puppet/modules/heat/spec/spec_helper_acceptance.rb
-file path=etc/puppet/modules/heat/spec/unit/provider/heat_api_paste_ini/ini_setting_spec.rb
-file path=etc/puppet/modules/heat/spec/unit/provider/heat_config/ini_setting_spec.rb
-file path=etc/puppet/modules/heat/spec/unit/type/heat_api_paste_ini_spec.rb
-file path=etc/puppet/modules/heat/spec/unit/type/heat_config_spec.rb
-file path=etc/puppet/modules/heat/test-requirements.txt
-file path=etc/puppet/modules/heat/tox.ini
+file path=usr/puppetlabs/puppet/modules/heat/CHANGELOG.md
+file path=usr/puppetlabs/puppet/modules/heat/Gemfile
+file path=usr/puppetlabs/puppet/modules/heat/LICENSE
+file path=usr/puppetlabs/puppet/modules/heat/README.md
+file path=usr/puppetlabs/puppet/modules/heat/Rakefile
+file path=usr/puppetlabs/puppet/modules/heat/checksums.json
+file path=usr/puppetlabs/puppet/modules/heat/examples/site.pp
+file path=usr/puppetlabs/puppet/modules/heat/lib/puppet/provider/heat_api_paste_ini/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/heat/lib/puppet/provider/heat_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/heat/lib/puppet/type/heat_api_paste_ini.rb
+file path=usr/puppetlabs/puppet/modules/heat/lib/puppet/type/heat_config.rb
+file path=usr/puppetlabs/puppet/modules/heat/manifests/api.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/api_cfn.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/api_cloudwatch.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/client.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/config.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/cron/purge_deleted.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/db.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/db/mysql.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/db/postgresql.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/db/sync.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/deps.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/engine.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/init.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/keystone/auth.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/keystone/auth_cfn.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/keystone/domain.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/logging.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/params.pp
+file path=usr/puppetlabs/puppet/modules/heat/manifests/policy.pp
+file path=usr/puppetlabs/puppet/modules/heat/metadata.json
+file path=usr/puppetlabs/puppet/modules/heat/releasenotes/notes/api_paste-b94e191896840944.yaml
+file path=usr/puppetlabs/puppet/modules/heat/releasenotes/notes/crontab_purge-89f321e9cf966933.yaml
+file path=usr/puppetlabs/puppet/modules/heat/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
+file path=usr/puppetlabs/puppet/modules/heat/releasenotes/notes/pymysql-e57bf1f0289dd426.yaml
+file path=usr/puppetlabs/puppet/modules/heat/releasenotes/notes/remove_qpid-0b446db43fdea617.yaml
+file path=usr/puppetlabs/puppet/modules/heat/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
+file path=usr/puppetlabs/puppet/modules/heat/releasenotes/notes/versionless-auth-urls-08c741084b9a9040.yaml
+file path=usr/puppetlabs/puppet/modules/heat/releasenotes/source/_static/.placeholder
+file path=usr/puppetlabs/puppet/modules/heat/releasenotes/source/conf.py
+file path=usr/puppetlabs/puppet/modules/heat/releasenotes/source/index.rst
+file path=usr/puppetlabs/puppet/modules/heat/releasenotes/source/mitaka.rst
+file path=usr/puppetlabs/puppet/modules/heat/releasenotes/source/unreleased.rst
+file path=usr/puppetlabs/puppet/modules/heat/setup.cfg
+file path=usr/puppetlabs/puppet/modules/heat/setup.py
+file path=usr/puppetlabs/puppet/modules/heat/spec/acceptance/basic_heat_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/acceptance/nodesets/centos-70-x64.yml
+file path=usr/puppetlabs/puppet/modules/heat/spec/acceptance/nodesets/default.yml
+file path=usr/puppetlabs/puppet/modules/heat/spec/acceptance/nodesets/nodepool-centos7.yml
+file path=usr/puppetlabs/puppet/modules/heat/spec/acceptance/nodesets/nodepool-trusty.yml
+file path=usr/puppetlabs/puppet/modules/heat/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_api_cfn_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_api_cloudwatch_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_api_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_client_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_cron_purge_deleted_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_db_mysql_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_db_postgresql_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_db_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_db_sync_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_deps_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_engine_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_init_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_keystone_auth_cfn_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_keystone_auth_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_keystone_domain_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_logging_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/classes/heat_policy_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/shared_examples.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/spec_helper.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/spec_helper_acceptance.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/unit/provider/heat_api_paste_ini/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/unit/provider/heat_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/unit/type/heat_api_paste_ini_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/spec/unit/type/heat_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/heat/test-requirements.txt
+file path=usr/puppetlabs/puppet/modules/heat/tox.ini
 #
 license openstack-heat.license license="Apache v2.0"
 
--- a/components/ruby/puppet-modules/openstack-horizon/openstack-horizon.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet-modules/openstack-horizon/openstack-horizon.p5m	Mon Nov 28 16:54:02 2016 -0800
@@ -35,51 +35,51 @@
     value="org.opensolaris.category.2008:System/Enterprise Management"
 set name=info.upstream value="OpenStack <[email protected]>"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2016/001
+set name=org.opensolaris.arc-caseid value=PSARC/2016/001 value=PSARC/2016/607
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file path=etc/puppet/modules/horizon/CHANGELOG.md
-file path=etc/puppet/modules/horizon/Gemfile
-file path=etc/puppet/modules/horizon/LICENSE
-file path=etc/puppet/modules/horizon/README.md
-file path=etc/puppet/modules/horizon/Rakefile
-file path=etc/puppet/modules/horizon/checksums.json
-file path=etc/puppet/modules/horizon/lib/puppet/parser/functions/os_any2array.rb
-file path=etc/puppet/modules/horizon/manifests/init.pp
-file path=etc/puppet/modules/horizon/manifests/params.pp
-file path=etc/puppet/modules/horizon/manifests/wsgi/apache.pp
-file path=etc/puppet/modules/horizon/metadata.json
-file path=etc/puppet/modules/horizon/releasenotes/notes/apache_ports-5d0eb0ca775ad7d1.yaml
-file path=etc/puppet/modules/horizon/releasenotes/notes/horizon_django_cache_compress_ubuntu-e1807c69e52048fd.yaml
-file path=etc/puppet/modules/horizon/releasenotes/notes/keystone_v3-d381e37592d3b29b.yaml
-file path=etc/puppet/modules/horizon/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
-file path=etc/puppet/modules/horizon/releasenotes/notes/remove_lesscpy-b4b677de57351078.yaml
-file path=etc/puppet/modules/horizon/releasenotes/notes/root_url-cede3a4a7ecafdf9.yaml
-file path=etc/puppet/modules/horizon/releasenotes/notes/trigger_collectstatic-fb465ebec48b3bc7.yaml
-file path=etc/puppet/modules/horizon/releasenotes/notes/update_local_settings_mitaka-f182327ce660fda0.yaml
-file path=etc/puppet/modules/horizon/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
-file path=etc/puppet/modules/horizon/releasenotes/source/_static/.placeholder
-file path=etc/puppet/modules/horizon/releasenotes/source/conf.py
-file path=etc/puppet/modules/horizon/releasenotes/source/index.rst
-file path=etc/puppet/modules/horizon/releasenotes/source/mitaka.rst
-file path=etc/puppet/modules/horizon/releasenotes/source/unreleased.rst
-file path=etc/puppet/modules/horizon/setup.cfg
-file path=etc/puppet/modules/horizon/setup.py
-file path=etc/puppet/modules/horizon/spec/acceptance/horizon_with_apache_spec.rb
-file path=etc/puppet/modules/horizon/spec/acceptance/nodesets/centos-70-x64.yml
-file path=etc/puppet/modules/horizon/spec/acceptance/nodesets/default.yml
-file path=etc/puppet/modules/horizon/spec/acceptance/nodesets/nodepool-centos7.yml
-file path=etc/puppet/modules/horizon/spec/acceptance/nodesets/nodepool-trusty.yml
-file path=etc/puppet/modules/horizon/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
-file path=etc/puppet/modules/horizon/spec/classes/horizon_init_spec.rb
-file path=etc/puppet/modules/horizon/spec/classes/horizon_wsgi_apache_spec.rb
-file path=etc/puppet/modules/horizon/spec/shared_examples.rb
-file path=etc/puppet/modules/horizon/spec/spec_helper.rb
-file path=etc/puppet/modules/horizon/spec/spec_helper_acceptance.rb
-file path=etc/puppet/modules/horizon/spec/unit/puppet/parser/functions/os_any2array_spec.rb
-file path=etc/puppet/modules/horizon/templates/local_settings.py.erb
-file path=etc/puppet/modules/horizon/test-requirements.txt
-file path=etc/puppet/modules/horizon/tox.ini
+file path=usr/puppetlabs/puppet/modules/horizon/CHANGELOG.md
+file path=usr/puppetlabs/puppet/modules/horizon/Gemfile
+file path=usr/puppetlabs/puppet/modules/horizon/LICENSE
+file path=usr/puppetlabs/puppet/modules/horizon/README.md
+file path=usr/puppetlabs/puppet/modules/horizon/Rakefile
+file path=usr/puppetlabs/puppet/modules/horizon/checksums.json
+file path=usr/puppetlabs/puppet/modules/horizon/lib/puppet/parser/functions/os_any2array.rb
+file path=usr/puppetlabs/puppet/modules/horizon/manifests/init.pp
+file path=usr/puppetlabs/puppet/modules/horizon/manifests/params.pp
+file path=usr/puppetlabs/puppet/modules/horizon/manifests/wsgi/apache.pp
+file path=usr/puppetlabs/puppet/modules/horizon/metadata.json
+file path=usr/puppetlabs/puppet/modules/horizon/releasenotes/notes/apache_ports-5d0eb0ca775ad7d1.yaml
+file path=usr/puppetlabs/puppet/modules/horizon/releasenotes/notes/horizon_django_cache_compress_ubuntu-e1807c69e52048fd.yaml
+file path=usr/puppetlabs/puppet/modules/horizon/releasenotes/notes/keystone_v3-d381e37592d3b29b.yaml
+file path=usr/puppetlabs/puppet/modules/horizon/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
+file path=usr/puppetlabs/puppet/modules/horizon/releasenotes/notes/remove_lesscpy-b4b677de57351078.yaml
+file path=usr/puppetlabs/puppet/modules/horizon/releasenotes/notes/root_url-cede3a4a7ecafdf9.yaml
+file path=usr/puppetlabs/puppet/modules/horizon/releasenotes/notes/trigger_collectstatic-fb465ebec48b3bc7.yaml
+file path=usr/puppetlabs/puppet/modules/horizon/releasenotes/notes/update_local_settings_mitaka-f182327ce660fda0.yaml
+file path=usr/puppetlabs/puppet/modules/horizon/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
+file path=usr/puppetlabs/puppet/modules/horizon/releasenotes/source/_static/.placeholder
+file path=usr/puppetlabs/puppet/modules/horizon/releasenotes/source/conf.py
+file path=usr/puppetlabs/puppet/modules/horizon/releasenotes/source/index.rst
+file path=usr/puppetlabs/puppet/modules/horizon/releasenotes/source/mitaka.rst
+file path=usr/puppetlabs/puppet/modules/horizon/releasenotes/source/unreleased.rst
+file path=usr/puppetlabs/puppet/modules/horizon/setup.cfg
+file path=usr/puppetlabs/puppet/modules/horizon/setup.py
+file path=usr/puppetlabs/puppet/modules/horizon/spec/acceptance/horizon_with_apache_spec.rb
+file path=usr/puppetlabs/puppet/modules/horizon/spec/acceptance/nodesets/centos-70-x64.yml
+file path=usr/puppetlabs/puppet/modules/horizon/spec/acceptance/nodesets/default.yml
+file path=usr/puppetlabs/puppet/modules/horizon/spec/acceptance/nodesets/nodepool-centos7.yml
+file path=usr/puppetlabs/puppet/modules/horizon/spec/acceptance/nodesets/nodepool-trusty.yml
+file path=usr/puppetlabs/puppet/modules/horizon/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+file path=usr/puppetlabs/puppet/modules/horizon/spec/classes/horizon_init_spec.rb
+file path=usr/puppetlabs/puppet/modules/horizon/spec/classes/horizon_wsgi_apache_spec.rb
+file path=usr/puppetlabs/puppet/modules/horizon/spec/shared_examples.rb
+file path=usr/puppetlabs/puppet/modules/horizon/spec/spec_helper.rb
+file path=usr/puppetlabs/puppet/modules/horizon/spec/spec_helper_acceptance.rb
+file path=usr/puppetlabs/puppet/modules/horizon/spec/unit/puppet/parser/functions/os_any2array_spec.rb
+file path=usr/puppetlabs/puppet/modules/horizon/templates/local_settings.py.erb
+file path=usr/puppetlabs/puppet/modules/horizon/test-requirements.txt
+file path=usr/puppetlabs/puppet/modules/horizon/tox.ini
 #
 license openstack-horizon.license license="Apache v2.0"
 
--- a/components/ruby/puppet-modules/openstack-horizon/patches/01-metadata.patch	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet-modules/openstack-horizon/patches/01-metadata.patch	Mon Nov 28 16:54:02 2016 -0800
@@ -2,20 +2,20 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-horizon-8.2.0/metadata.json.orig 2016-08-07 10:54:47.621488025 -0700
-+++ openstack-horizon-8.2.0/metadata.json       2016-08-07 10:55:10.202795687 -0700
-@@ -30,6 +30,13 @@
+diff --git a/metadata.json b/metadata.json
+--- a/metadata.json
++++ b/metadata.json
+@@ -29,6 +29,13 @@
+       "operatingsystemrelease": [
          "14.04"
        ]
-     }
++    },
 +    {
 +      "operatingsystem": "Solaris",
 +      "operatingsystemrelease": [
 +        "12.0",
 +        "11.3"
 +      ]
-+    }
+     }
    ],
    "description": "Installs and configures OpenStack Horizon (Dashboard).",
-   "dependencies": [
-
--- a/components/ruby/puppet-modules/openstack-ironic/openstack-ironic.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet-modules/openstack-ironic/openstack-ironic.p5m	Mon Nov 28 16:54:02 2016 -0800
@@ -35,107 +35,107 @@
     value="org.opensolaris.category.2008:System/Enterprise Management"
 set name=info.upstream value="OpenStack <[email protected]>"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2016/001
+set name=org.opensolaris.arc-caseid value=PSARC/2016/001 value=PSARC/2016/607
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file path=etc/puppet/modules/ironic/CHANGELOG.md
-file path=etc/puppet/modules/ironic/Gemfile
-file path=etc/puppet/modules/ironic/LICENSE
-file path=etc/puppet/modules/ironic/README.md
-file path=etc/puppet/modules/ironic/Rakefile
-file path=etc/puppet/modules/ironic/checksums.json
-file path=etc/puppet/modules/ironic/examples/ironic.pp
-file path=etc/puppet/modules/ironic/lib/puppet/provider/ironic.rb
-file path=etc/puppet/modules/ironic/lib/puppet/provider/ironic_api_paste_ini/ini_setting.rb
-file path=etc/puppet/modules/ironic/lib/puppet/provider/ironic_config/ini_setting.rb
-file path=etc/puppet/modules/ironic/lib/puppet/provider/ironic_inspector_config/ini_setting.rb
-file path=etc/puppet/modules/ironic/lib/puppet/type/ironic_api_paste_ini.rb
-file path=etc/puppet/modules/ironic/lib/puppet/type/ironic_config.rb
-file path=etc/puppet/modules/ironic/lib/puppet/type/ironic_inspector_config.rb
-file path=etc/puppet/modules/ironic/manifests/api.pp
-file path=etc/puppet/modules/ironic/manifests/bifrost.pp
-file path=etc/puppet/modules/ironic/manifests/client.pp
-file path=etc/puppet/modules/ironic/manifests/conductor.pp
-file path=etc/puppet/modules/ironic/manifests/config.pp
-file path=etc/puppet/modules/ironic/manifests/db.pp
-file path=etc/puppet/modules/ironic/manifests/db/inspector_sync.pp
-file path=etc/puppet/modules/ironic/manifests/db/mysql.pp
-file path=etc/puppet/modules/ironic/manifests/db/postgresql.pp
-file path=etc/puppet/modules/ironic/manifests/db/sync.pp
-file path=etc/puppet/modules/ironic/manifests/drivers/ipmi.pp
-file path=etc/puppet/modules/ironic/manifests/drivers/pxe.pp
+file path=usr/puppetlabs/puppet/modules/ironic/CHANGELOG.md
+file path=usr/puppetlabs/puppet/modules/ironic/Gemfile
+file path=usr/puppetlabs/puppet/modules/ironic/LICENSE
+file path=usr/puppetlabs/puppet/modules/ironic/README.md
+file path=usr/puppetlabs/puppet/modules/ironic/Rakefile
+file path=usr/puppetlabs/puppet/modules/ironic/checksums.json
+file path=usr/puppetlabs/puppet/modules/ironic/examples/ironic.pp
+file path=usr/puppetlabs/puppet/modules/ironic/lib/puppet/provider/ironic.rb
+file path=usr/puppetlabs/puppet/modules/ironic/lib/puppet/provider/ironic_api_paste_ini/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/ironic/lib/puppet/provider/ironic_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/ironic/lib/puppet/provider/ironic_inspector_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/ironic/lib/puppet/type/ironic_api_paste_ini.rb
+file path=usr/puppetlabs/puppet/modules/ironic/lib/puppet/type/ironic_config.rb
+file path=usr/puppetlabs/puppet/modules/ironic/lib/puppet/type/ironic_inspector_config.rb
+file path=usr/puppetlabs/puppet/modules/ironic/manifests/api.pp
+file path=usr/puppetlabs/puppet/modules/ironic/manifests/bifrost.pp
+file path=usr/puppetlabs/puppet/modules/ironic/manifests/client.pp
+file path=usr/puppetlabs/puppet/modules/ironic/manifests/conductor.pp
+file path=usr/puppetlabs/puppet/modules/ironic/manifests/config.pp
+file path=usr/puppetlabs/puppet/modules/ironic/manifests/db.pp
+file path=usr/puppetlabs/puppet/modules/ironic/manifests/db/inspector_sync.pp
+file path=usr/puppetlabs/puppet/modules/ironic/manifests/db/mysql.pp
+file path=usr/puppetlabs/puppet/modules/ironic/manifests/db/postgresql.pp
+file path=usr/puppetlabs/puppet/modules/ironic/manifests/db/sync.pp
+file path=usr/puppetlabs/puppet/modules/ironic/manifests/drivers/ipmi.pp
+file path=usr/puppetlabs/puppet/modules/ironic/manifests/drivers/pxe.pp
 file files/solaris_ipmitool.pp \
-    path=etc/puppet/modules/ironic/manifests/drivers/solaris_ipmitool.pp
-file path=etc/puppet/modules/ironic/manifests/init.pp
-file path=etc/puppet/modules/ironic/manifests/inspector.pp
-file path=etc/puppet/modules/ironic/manifests/inspector/logging.pp
-file path=etc/puppet/modules/ironic/manifests/keystone/auth.pp
-file path=etc/puppet/modules/ironic/manifests/keystone/auth_inspector.pp
-file path=etc/puppet/modules/ironic/manifests/logging.pp
-file path=etc/puppet/modules/ironic/manifests/params.pp
-file path=etc/puppet/modules/ironic/manifests/policy.pp
-file path=etc/puppet/modules/ironic/manifests/wsgi/apache.pp
-file path=etc/puppet/modules/ironic/metadata.json
-file path=etc/puppet/modules/ironic/releasenotes/notes/api_paste-b94e191896840944.yaml
-file path=etc/puppet/modules/ironic/releasenotes/notes/api_wsgi-e8eb12b8e66ffe4e.yaml
-file path=etc/puppet/modules/ironic/releasenotes/notes/deprecate_cluster_id-8d9838a9ef8932bf.yaml
-file path=etc/puppet/modules/ironic/releasenotes/notes/inspector_mitaka-5984d9af2ba56cb3.yaml
-file path=etc/puppet/modules/ironic/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
-file path=etc/puppet/modules/ironic/releasenotes/notes/pymysql-e57bf1f0289dd426.yaml
-file path=etc/puppet/modules/ironic/releasenotes/notes/remove_old_auth-d9fc4af8e2ced291.yaml
-file path=etc/puppet/modules/ironic/releasenotes/notes/remove_qpid-0b446db43fdea617.yaml
-file path=etc/puppet/modules/ironic/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
-file path=etc/puppet/modules/ironic/releasenotes/source/_static/.placeholder
-file path=etc/puppet/modules/ironic/releasenotes/source/conf.py
-file path=etc/puppet/modules/ironic/releasenotes/source/index.rst
-file path=etc/puppet/modules/ironic/releasenotes/source/mitaka.rst
-file path=etc/puppet/modules/ironic/releasenotes/source/unreleased.rst
-file path=etc/puppet/modules/ironic/setup.cfg
-file path=etc/puppet/modules/ironic/setup.py
-file path=etc/puppet/modules/ironic/spec/acceptance/ironic_wsgi_apache_spec.rb
-file path=etc/puppet/modules/ironic/spec/acceptance/nodesets/centos-70-x64.yml
-file path=etc/puppet/modules/ironic/spec/acceptance/nodesets/default.yml
-file path=etc/puppet/modules/ironic/spec/acceptance/nodesets/nodepool-centos7.yml
-file path=etc/puppet/modules/ironic/spec/acceptance/nodesets/nodepool-trusty.yml
-file path=etc/puppet/modules/ironic/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
-file path=etc/puppet/modules/ironic/spec/classes/inspector_db_sync_spec.rb
-file path=etc/puppet/modules/ironic/spec/classes/ironic_api_spec.rb
-file path=etc/puppet/modules/ironic/spec/classes/ironic_bifrost_spec.rb
-file path=etc/puppet/modules/ironic/spec/classes/ironic_client_spec.rb
-file path=etc/puppet/modules/ironic/spec/classes/ironic_conductor_spec.rb
-file path=etc/puppet/modules/ironic/spec/classes/ironic_config_spec.rb
-file path=etc/puppet/modules/ironic/spec/classes/ironic_db_mysql_spec.rb
-file path=etc/puppet/modules/ironic/spec/classes/ironic_db_postgresql_spec.rb
-file path=etc/puppet/modules/ironic/spec/classes/ironic_db_spec.rb
-file path=etc/puppet/modules/ironic/spec/classes/ironic_db_sync_spec.rb
-file path=etc/puppet/modules/ironic/spec/classes/ironic_drivers_ipmi_spec.rb
-file path=etc/puppet/modules/ironic/spec/classes/ironic_drivers_pxe_spec.rb
-file path=etc/puppet/modules/ironic/spec/classes/ironic_init_spec.rb
-file path=etc/puppet/modules/ironic/spec/classes/ironic_inspector_logging_spec.rb
-file path=etc/puppet/modules/ironic/spec/classes/ironic_inspector_spec.rb
-file path=etc/puppet/modules/ironic/spec/classes/ironic_keystone_auth_inspector_spec.rb
-file path=etc/puppet/modules/ironic/spec/classes/ironic_keystone_auth_spec.rb
-file path=etc/puppet/modules/ironic/spec/classes/ironic_logging_spec.rb
-file path=etc/puppet/modules/ironic/spec/classes/ironic_policy_spec.rb
-file path=etc/puppet/modules/ironic/spec/classes/ironic_wsgi_apache_spec.rb
-file path=etc/puppet/modules/ironic/spec/shared_examples.rb
-file path=etc/puppet/modules/ironic/spec/spec_helper.rb
-file path=etc/puppet/modules/ironic/spec/spec_helper_acceptance.rb
-file path=etc/puppet/modules/ironic/spec/unit/provider/ironic_api_paste_ini/ini_setting_spec.rb
-file path=etc/puppet/modules/ironic/spec/unit/provider/ironic_config/ini_setting_spec.rb
-file path=etc/puppet/modules/ironic/spec/unit/provider/ironic_inspector_config/ini_setting_spec.rb
-file path=etc/puppet/modules/ironic/spec/unit/provider/ironic_spec.rb
-file path=etc/puppet/modules/ironic/spec/unit/type/ironic_api_paste_ini_spec.rb
-file path=etc/puppet/modules/ironic/spec/unit/type/ironic_config_spec.rb
-file path=etc/puppet/modules/ironic/spec/unit/type/ironic_inspector_config_spec.rb
-file path=etc/puppet/modules/ironic/templates/baremetal.json.erb
-file path=etc/puppet/modules/ironic/templates/bifrost_global_vars.erb
-file path=etc/puppet/modules/ironic/templates/inspector_dnsmasq_http.erb
-file path=etc/puppet/modules/ironic/templates/inspector_dnsmasq_tftp.erb
-file path=etc/puppet/modules/ironic/templates/inspector_ipxe.erb
-file path=etc/puppet/modules/ironic/templates/inspector_pxelinux_cfg.erb
-file path=etc/puppet/modules/ironic/test-requirements.txt
-file path=etc/puppet/modules/ironic/tox.ini
+    path=usr/puppetlabs/puppet/modules/ironic/manifests/drivers/solaris_ipmitool.pp
+file path=usr/puppetlabs/puppet/modules/ironic/manifests/init.pp
+file path=usr/puppetlabs/puppet/modules/ironic/manifests/inspector.pp
+file path=usr/puppetlabs/puppet/modules/ironic/manifests/inspector/logging.pp
+file path=usr/puppetlabs/puppet/modules/ironic/manifests/keystone/auth.pp
+file path=usr/puppetlabs/puppet/modules/ironic/manifests/keystone/auth_inspector.pp
+file path=usr/puppetlabs/puppet/modules/ironic/manifests/logging.pp
+file path=usr/puppetlabs/puppet/modules/ironic/manifests/params.pp
+file path=usr/puppetlabs/puppet/modules/ironic/manifests/policy.pp
+file path=usr/puppetlabs/puppet/modules/ironic/manifests/wsgi/apache.pp
+file path=usr/puppetlabs/puppet/modules/ironic/metadata.json
+file path=usr/puppetlabs/puppet/modules/ironic/releasenotes/notes/api_paste-b94e191896840944.yaml
+file path=usr/puppetlabs/puppet/modules/ironic/releasenotes/notes/api_wsgi-e8eb12b8e66ffe4e.yaml
+file path=usr/puppetlabs/puppet/modules/ironic/releasenotes/notes/deprecate_cluster_id-8d9838a9ef8932bf.yaml
+file path=usr/puppetlabs/puppet/modules/ironic/releasenotes/notes/inspector_mitaka-5984d9af2ba56cb3.yaml
+file path=usr/puppetlabs/puppet/modules/ironic/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
+file path=usr/puppetlabs/puppet/modules/ironic/releasenotes/notes/pymysql-e57bf1f0289dd426.yaml
+file path=usr/puppetlabs/puppet/modules/ironic/releasenotes/notes/remove_old_auth-d9fc4af8e2ced291.yaml
+file path=usr/puppetlabs/puppet/modules/ironic/releasenotes/notes/remove_qpid-0b446db43fdea617.yaml
+file path=usr/puppetlabs/puppet/modules/ironic/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
+file path=usr/puppetlabs/puppet/modules/ironic/releasenotes/source/_static/.placeholder
+file path=usr/puppetlabs/puppet/modules/ironic/releasenotes/source/conf.py
+file path=usr/puppetlabs/puppet/modules/ironic/releasenotes/source/index.rst
+file path=usr/puppetlabs/puppet/modules/ironic/releasenotes/source/mitaka.rst
+file path=usr/puppetlabs/puppet/modules/ironic/releasenotes/source/unreleased.rst
+file path=usr/puppetlabs/puppet/modules/ironic/setup.cfg
+file path=usr/puppetlabs/puppet/modules/ironic/setup.py
+file path=usr/puppetlabs/puppet/modules/ironic/spec/acceptance/ironic_wsgi_apache_spec.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/acceptance/nodesets/centos-70-x64.yml
+file path=usr/puppetlabs/puppet/modules/ironic/spec/acceptance/nodesets/default.yml
+file path=usr/puppetlabs/puppet/modules/ironic/spec/acceptance/nodesets/nodepool-centos7.yml
+file path=usr/puppetlabs/puppet/modules/ironic/spec/acceptance/nodesets/nodepool-trusty.yml
+file path=usr/puppetlabs/puppet/modules/ironic/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+file path=usr/puppetlabs/puppet/modules/ironic/spec/classes/inspector_db_sync_spec.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/classes/ironic_api_spec.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/classes/ironic_bifrost_spec.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/classes/ironic_client_spec.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/classes/ironic_conductor_spec.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/classes/ironic_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/classes/ironic_db_mysql_spec.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/classes/ironic_db_postgresql_spec.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/classes/ironic_db_spec.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/classes/ironic_db_sync_spec.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/classes/ironic_drivers_ipmi_spec.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/classes/ironic_drivers_pxe_spec.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/classes/ironic_init_spec.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/classes/ironic_inspector_logging_spec.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/classes/ironic_inspector_spec.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/classes/ironic_keystone_auth_inspector_spec.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/classes/ironic_keystone_auth_spec.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/classes/ironic_logging_spec.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/classes/ironic_policy_spec.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/classes/ironic_wsgi_apache_spec.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/shared_examples.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/spec_helper.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/spec_helper_acceptance.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/unit/provider/ironic_api_paste_ini/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/unit/provider/ironic_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/unit/provider/ironic_inspector_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/unit/provider/ironic_spec.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/unit/type/ironic_api_paste_ini_spec.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/unit/type/ironic_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/ironic/spec/unit/type/ironic_inspector_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/ironic/templates/baremetal.json.erb
+file path=usr/puppetlabs/puppet/modules/ironic/templates/bifrost_global_vars.erb
+file path=usr/puppetlabs/puppet/modules/ironic/templates/inspector_dnsmasq_http.erb
+file path=usr/puppetlabs/puppet/modules/ironic/templates/inspector_dnsmasq_tftp.erb
+file path=usr/puppetlabs/puppet/modules/ironic/templates/inspector_ipxe.erb
+file path=usr/puppetlabs/puppet/modules/ironic/templates/inspector_pxelinux_cfg.erb
+file path=usr/puppetlabs/puppet/modules/ironic/test-requirements.txt
+file path=usr/puppetlabs/puppet/modules/ironic/tox.ini
 #
 license openstack-ironic.license license="Apache v2.0"
 
--- a/components/ruby/puppet-modules/openstack-keystone/openstack-keystone.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet-modules/openstack-keystone/openstack-keystone.p5m	Mon Nov 28 16:54:02 2016 -0800
@@ -35,179 +35,179 @@
     value="org.opensolaris.category.2008:System/Enterprise Management"
 set name=info.upstream value="OpenStack <[email protected]>"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2016/001
+set name=org.opensolaris.arc-caseid value=PSARC/2016/001 value=PSARC/2016/607
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file path=etc/puppet/modules/keystone/CHANGELOG.md
-file path=etc/puppet/modules/keystone/Gemfile
-file path=etc/puppet/modules/keystone/LICENSE
-file path=etc/puppet/modules/keystone/README.md
-file path=etc/puppet/modules/keystone/Rakefile
-file path=etc/puppet/modules/keystone/checksums.json
-file path=etc/puppet/modules/keystone/examples/apache_dropin.pp
-file path=etc/puppet/modules/keystone/examples/apache_with_paths.pp
-file path=etc/puppet/modules/keystone/examples/k2k_sp_shib.pp
-file path=etc/puppet/modules/keystone/examples/ldap_backend.pp
-file path=etc/puppet/modules/keystone/examples/ldap_full.pp
-file path=etc/puppet/modules/keystone/examples/ldap_identity.pp
-file path=etc/puppet/modules/keystone/examples/user_project_user_role_composite_namevar.pp
-file path=etc/puppet/modules/keystone/examples/v3_basic.pp
-file path=etc/puppet/modules/keystone/examples/v3_domain_configuration.pp
-file path=etc/puppet/modules/keystone/ext/keystone_test.rb
-file path=etc/puppet/modules/keystone/ext/keystone_test_v3.rb
-file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone.rb
-file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone/util.rb
-file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_config/ini_setting.rb
-file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_domain/openstack.rb
-file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_domain_config/openstack.rb
-file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_endpoint/openstack.rb
-file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_identity_provider/openstack.rb
-file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_paste_ini/ini_setting.rb
-file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_role/openstack.rb
-file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_service/openstack.rb
-file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_tenant/openstack.rb
-file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_user/openstack.rb
-file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_user_role/openstack.rb
-file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_config.rb
-file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_domain.rb
-file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_domain_config.rb
-file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_endpoint.rb
-file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_identity_provider.rb
-file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_paste_ini.rb
-file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_role.rb
-file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_service.rb
-file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_tenant.rb
-file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_user.rb
-file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_user_role.rb
-file path=etc/puppet/modules/keystone/lib/puppet_x/keystone/composite_namevar.rb
-file path=etc/puppet/modules/keystone/lib/puppet_x/keystone/composite_namevar/helpers.rb
-file path=etc/puppet/modules/keystone/lib/puppet_x/keystone/composite_namevar/helpers/utilities.rb
-file path=etc/puppet/modules/keystone/lib/puppet_x/keystone/type.rb
-file path=etc/puppet/modules/keystone/lib/puppet_x/keystone/type/default_domain.rb
-file path=etc/puppet/modules/keystone/lib/puppet_x/keystone/type/read_only.rb
-file path=etc/puppet/modules/keystone/lib/puppet_x/keystone/type/required.rb
-file path=etc/puppet/modules/keystone/lib/puppet_x/keystone_config/ini_setting.rb
-file path=etc/puppet/modules/keystone/manifests/client.pp
-file path=etc/puppet/modules/keystone/manifests/config.pp
-file path=etc/puppet/modules/keystone/manifests/cron/token_flush.pp
-file path=etc/puppet/modules/keystone/manifests/db.pp
-file path=etc/puppet/modules/keystone/manifests/db/mysql.pp
-file path=etc/puppet/modules/keystone/manifests/db/postgresql.pp
-file path=etc/puppet/modules/keystone/manifests/db/sync.pp
-file path=etc/puppet/modules/keystone/manifests/deps.pp
-file path=etc/puppet/modules/keystone/manifests/disable_admin_token_auth.pp
-file path=etc/puppet/modules/keystone/manifests/endpoint.pp
-file path=etc/puppet/modules/keystone/manifests/federation/identity_provider.pp
-file path=etc/puppet/modules/keystone/manifests/federation/mellon.pp
-file path=etc/puppet/modules/keystone/manifests/federation/shibboleth.pp
-file path=etc/puppet/modules/keystone/manifests/init.pp
-file path=etc/puppet/modules/keystone/manifests/ldap.pp
-file path=etc/puppet/modules/keystone/manifests/ldap_backend.pp
-file path=etc/puppet/modules/keystone/manifests/logging.pp
-file path=etc/puppet/modules/keystone/manifests/params.pp
-file path=etc/puppet/modules/keystone/manifests/policy.pp
-file path=etc/puppet/modules/keystone/manifests/python.pp
-file path=etc/puppet/modules/keystone/manifests/resource/authtoken.pp
-file path=etc/puppet/modules/keystone/manifests/resource/service_identity.pp
-file path=etc/puppet/modules/keystone/manifests/roles/admin.pp
-file path=etc/puppet/modules/keystone/manifests/service.pp
-file path=etc/puppet/modules/keystone/manifests/wsgi/apache.pp
-file path=etc/puppet/modules/keystone/metadata.json
-file path=etc/puppet/modules/keystone/releasenotes/notes/deprecated_ldap-02957eb56827ead5.yaml
-file path=etc/puppet/modules/keystone/releasenotes/notes/disable_admin_token_auth-b82d0aca80d1f091.yaml
-file path=etc/puppet/modules/keystone/releasenotes/notes/ensure_parameter_service_identity_resource-610076e4902c23ec.yaml
-file path=etc/puppet/modules/keystone/releasenotes/notes/federation_with_mellon-2f8229c1464b2e0e.yaml
-file path=etc/puppet/modules/keystone/releasenotes/notes/fix-cache-configs-a3972486723f1d99.yaml
-file path=etc/puppet/modules/keystone/releasenotes/notes/fix_admin-fee6e76089c07a42.yaml
-file path=etc/puppet/modules/keystone/releasenotes/notes/fix_endpoint_region-0fa0d89061ebaf12.yaml
-file path=etc/puppet/modules/keystone/releasenotes/notes/fix_openrc_v2-64049769daf57b65.yaml
-file path=etc/puppet/modules/keystone/releasenotes/notes/hash_domains-d6a867466bcf324b.yaml
-file path=etc/puppet/modules/keystone/releasenotes/notes/ipv6_provider-796b60badd356e59.yaml
-file path=etc/puppet/modules/keystone/releasenotes/notes/keystone-wsgi-scripts-0d772d1f9f2d6c57.yaml
-file path=etc/puppet/modules/keystone/releasenotes/notes/keystone_bootstrap-4bf00198001d3350.yaml
-file path=etc/puppet/modules/keystone/releasenotes/notes/keystone_hooks_support-2c9e8b09bdbd1b5b.yaml
-file path=etc/puppet/modules/keystone/releasenotes/notes/keystone_identity_provider-9b6f6b3ad70c60f3.yaml
-file path=etc/puppet/modules/keystone/releasenotes/notes/keystone_python_depr-80fa804d9cd242c5.yaml
-file path=etc/puppet/modules/keystone/releasenotes/notes/manage_ldap_packages-3b739e338f3e59c2.yaml
-file path=etc/puppet/modules/keystone/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
-file path=etc/puppet/modules/keystone/releasenotes/notes/multi_domain_configuration-32dc8cbef450f1d6.yaml
-file path=etc/puppet/modules/keystone/releasenotes/notes/multi_ldap-975858a46dd622a6.yaml
-file path=etc/puppet/modules/keystone/releasenotes/notes/os_service_default-9caeeb340d4bb303.yaml
-file path=etc/puppet/modules/keystone/releasenotes/notes/policy_driver-c991dd693d2336fc.yaml
-file path=etc/puppet/modules/keystone/releasenotes/notes/policy_rc_d_keystone_eventlet-2dc65eb3d27f8969.yaml
-file path=etc/puppet/modules/keystone/releasenotes/notes/remove_unused_class-0615d6744896ad97.yaml
-file path=etc/puppet/modules/keystone/releasenotes/notes/stop_posix_and_files-930ee921d0ebead2.yaml
-file path=etc/puppet/modules/keystone/releasenotes/notes/support_multi_domain-bd04f18aa7913eaa.yaml
-file path=etc/puppet/modules/keystone/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
-file path=etc/puppet/modules/keystone/releasenotes/source/_static/.placeholder
-file path=etc/puppet/modules/keystone/releasenotes/source/conf.py
-file path=etc/puppet/modules/keystone/releasenotes/source/index.rst
-file path=etc/puppet/modules/keystone/releasenotes/source/unreleased.rst
-file path=etc/puppet/modules/keystone/setup.cfg
-file path=etc/puppet/modules/keystone/setup.py
-file path=etc/puppet/modules/keystone/spec/acceptance/default_domain_spec.rb
-file path=etc/puppet/modules/keystone/spec/acceptance/keystone_federation_identity_provider_spec.rb
-file path=etc/puppet/modules/keystone/spec/acceptance/keystone_federation_shibboleth_spec.rb
-file path=etc/puppet/modules/keystone/spec/acceptance/keystone_wsgi_apache_spec.rb
-file path=etc/puppet/modules/keystone/spec/acceptance/nodesets/centos-70-x64.yml
-file path=etc/puppet/modules/keystone/spec/acceptance/nodesets/default.yml
-file path=etc/puppet/modules/keystone/spec/acceptance/nodesets/nodepool-centos7.yml
-file path=etc/puppet/modules/keystone/spec/acceptance/nodesets/nodepool-trusty.yml
-file path=etc/puppet/modules/keystone/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
-file path=etc/puppet/modules/keystone/spec/classes/keystone_client_spec.rb
-file path=etc/puppet/modules/keystone/spec/classes/keystone_cron_token_flush_spec.rb
-file path=etc/puppet/modules/keystone/spec/classes/keystone_db_mysql_spec.rb
-file path=etc/puppet/modules/keystone/spec/classes/keystone_db_postgresql_spec.rb
-file path=etc/puppet/modules/keystone/spec/classes/keystone_db_spec.rb
-file path=etc/puppet/modules/keystone/spec/classes/keystone_db_sync_spec.rb
-file path=etc/puppet/modules/keystone/spec/classes/keystone_deps_spec.rb
-file path=etc/puppet/modules/keystone/spec/classes/keystone_disable_admin_token_auth_spec.rb
-file path=etc/puppet/modules/keystone/spec/classes/keystone_endpoint_spec.rb
-file path=etc/puppet/modules/keystone/spec/classes/keystone_federation_identity_provider_spec.rb
-file path=etc/puppet/modules/keystone/spec/classes/keystone_federation_mellon.rb
-file path=etc/puppet/modules/keystone/spec/classes/keystone_federation_shibboleth.rb
-file path=etc/puppet/modules/keystone/spec/classes/keystone_ldap_spec.rb
-file path=etc/puppet/modules/keystone/spec/classes/keystone_logging_spec.rb
-file path=etc/puppet/modules/keystone/spec/classes/keystone_policy_spec.rb
-file path=etc/puppet/modules/keystone/spec/classes/keystone_roles_admin_spec.rb
-file path=etc/puppet/modules/keystone/spec/classes/keystone_service_spec.rb
-file path=etc/puppet/modules/keystone/spec/classes/keystone_spec.rb
-file path=etc/puppet/modules/keystone/spec/classes/keystone_wsgi_apache_spec.rb
-file path=etc/puppet/modules/keystone/spec/defines/keystone_ldap_backend_spec.rb
-file path=etc/puppet/modules/keystone/spec/defines/keystone_resource_authtoken_spec.rb
-file path=etc/puppet/modules/keystone/spec/defines/keystone_resource_service_identity_spec.rb
-file path=etc/puppet/modules/keystone/spec/shared_examples.rb
-file path=etc/puppet/modules/keystone/spec/shared_examples_acceptance.rb
-file path=etc/puppet/modules/keystone/spec/spec.opts
-file path=etc/puppet/modules/keystone/spec/spec_helper.rb
-file path=etc/puppet/modules/keystone/spec/spec_helper_acceptance.rb
-file path=etc/puppet/modules/keystone/spec/unit/provider/keystone/util_spec.rb
-file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_config/ini_setting_spec.rb
-file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_domain/openstack_spec.rb
-file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_domain_config/openstack_spec.rb
-file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_endpoint/openstack_spec.rb
-file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_identity_provider/openstack_spec.rb
-file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_paste_ini/ini_setting_spec.rb
-file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_role/openstack_spec.rb
-file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_service/openstack_spec.rb
-file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_spec.rb
-file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_tenant/openstack_spec.rb
-file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_user/openstack_spec.rb
-file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_user_role/openstack_spec.rb
-file path=etc/puppet/modules/keystone/spec/unit/type/keystone_config_spec.rb
-file path=etc/puppet/modules/keystone/spec/unit/type/keystone_domain_config_spec.rb
-file path=etc/puppet/modules/keystone/spec/unit/type/keystone_endpoint_spec.rb
-file path=etc/puppet/modules/keystone/spec/unit/type/keystone_identity_provider_spec.rb
-file path=etc/puppet/modules/keystone/spec/unit/type/keystone_paste_ini_spec.rb
-file path=etc/puppet/modules/keystone/spec/unit/type/keystone_service_spec.rb
-file path=etc/puppet/modules/keystone/spec/unit/type/keystone_tenant_spec.rb
-file path=etc/puppet/modules/keystone/spec/unit/type/keystone_user_role_spec.rb
-file path=etc/puppet/modules/keystone/spec/unit/type/keystone_user_spec.rb
-file path=etc/puppet/modules/keystone/templates/mellon.conf.erb
-file path=etc/puppet/modules/keystone/templates/shibboleth.conf.erb
-file path=etc/puppet/modules/keystone/test-requirements.txt
-file path=etc/puppet/modules/keystone/tests/site.pp
-file path=etc/puppet/modules/keystone/tox.ini
+file path=usr/puppetlabs/puppet/modules/keystone/CHANGELOG.md
+file path=usr/puppetlabs/puppet/modules/keystone/Gemfile
+file path=usr/puppetlabs/puppet/modules/keystone/LICENSE
+file path=usr/puppetlabs/puppet/modules/keystone/README.md
+file path=usr/puppetlabs/puppet/modules/keystone/Rakefile
+file path=usr/puppetlabs/puppet/modules/keystone/checksums.json
+file path=usr/puppetlabs/puppet/modules/keystone/examples/apache_dropin.pp
+file path=usr/puppetlabs/puppet/modules/keystone/examples/apache_with_paths.pp
+file path=usr/puppetlabs/puppet/modules/keystone/examples/k2k_sp_shib.pp
+file path=usr/puppetlabs/puppet/modules/keystone/examples/ldap_backend.pp
+file path=usr/puppetlabs/puppet/modules/keystone/examples/ldap_full.pp
+file path=usr/puppetlabs/puppet/modules/keystone/examples/ldap_identity.pp
+file path=usr/puppetlabs/puppet/modules/keystone/examples/user_project_user_role_composite_namevar.pp
+file path=usr/puppetlabs/puppet/modules/keystone/examples/v3_basic.pp
+file path=usr/puppetlabs/puppet/modules/keystone/examples/v3_domain_configuration.pp
+file path=usr/puppetlabs/puppet/modules/keystone/ext/keystone_test.rb
+file path=usr/puppetlabs/puppet/modules/keystone/ext/keystone_test_v3.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet/provider/keystone.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet/provider/keystone/util.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet/provider/keystone_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet/provider/keystone_domain/openstack.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet/provider/keystone_domain_config/openstack.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet/provider/keystone_endpoint/openstack.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet/provider/keystone_identity_provider/openstack.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet/provider/keystone_paste_ini/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet/provider/keystone_role/openstack.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet/provider/keystone_service/openstack.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet/provider/keystone_tenant/openstack.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet/provider/keystone_user/openstack.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet/provider/keystone_user_role/openstack.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet/type/keystone_config.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet/type/keystone_domain.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet/type/keystone_domain_config.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet/type/keystone_endpoint.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet/type/keystone_identity_provider.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet/type/keystone_paste_ini.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet/type/keystone_role.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet/type/keystone_service.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet/type/keystone_tenant.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet/type/keystone_user.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet/type/keystone_user_role.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet_x/keystone/composite_namevar.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet_x/keystone/composite_namevar/helpers.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet_x/keystone/composite_namevar/helpers/utilities.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet_x/keystone/type.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet_x/keystone/type/default_domain.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet_x/keystone/type/read_only.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet_x/keystone/type/required.rb
+file path=usr/puppetlabs/puppet/modules/keystone/lib/puppet_x/keystone_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/keystone/manifests/client.pp
+file path=usr/puppetlabs/puppet/modules/keystone/manifests/config.pp
+file path=usr/puppetlabs/puppet/modules/keystone/manifests/cron/token_flush.pp
+file path=usr/puppetlabs/puppet/modules/keystone/manifests/db.pp
+file path=usr/puppetlabs/puppet/modules/keystone/manifests/db/mysql.pp
+file path=usr/puppetlabs/puppet/modules/keystone/manifests/db/postgresql.pp
+file path=usr/puppetlabs/puppet/modules/keystone/manifests/db/sync.pp
+file path=usr/puppetlabs/puppet/modules/keystone/manifests/deps.pp
+file path=usr/puppetlabs/puppet/modules/keystone/manifests/disable_admin_token_auth.pp
+file path=usr/puppetlabs/puppet/modules/keystone/manifests/endpoint.pp
+file path=usr/puppetlabs/puppet/modules/keystone/manifests/federation/identity_provider.pp
+file path=usr/puppetlabs/puppet/modules/keystone/manifests/federation/mellon.pp
+file path=usr/puppetlabs/puppet/modules/keystone/manifests/federation/shibboleth.pp
+file path=usr/puppetlabs/puppet/modules/keystone/manifests/init.pp
+file path=usr/puppetlabs/puppet/modules/keystone/manifests/ldap.pp
+file path=usr/puppetlabs/puppet/modules/keystone/manifests/ldap_backend.pp
+file path=usr/puppetlabs/puppet/modules/keystone/manifests/logging.pp
+file path=usr/puppetlabs/puppet/modules/keystone/manifests/params.pp
+file path=usr/puppetlabs/puppet/modules/keystone/manifests/policy.pp
+file path=usr/puppetlabs/puppet/modules/keystone/manifests/python.pp
+file path=usr/puppetlabs/puppet/modules/keystone/manifests/resource/authtoken.pp
+file path=usr/puppetlabs/puppet/modules/keystone/manifests/resource/service_identity.pp
+file path=usr/puppetlabs/puppet/modules/keystone/manifests/roles/admin.pp
+file path=usr/puppetlabs/puppet/modules/keystone/manifests/service.pp
+file path=usr/puppetlabs/puppet/modules/keystone/manifests/wsgi/apache.pp
+file path=usr/puppetlabs/puppet/modules/keystone/metadata.json
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/notes/deprecated_ldap-02957eb56827ead5.yaml
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/notes/disable_admin_token_auth-b82d0aca80d1f091.yaml
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/notes/ensure_parameter_service_identity_resource-610076e4902c23ec.yaml
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/notes/federation_with_mellon-2f8229c1464b2e0e.yaml
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/notes/fix-cache-configs-a3972486723f1d99.yaml
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/notes/fix_admin-fee6e76089c07a42.yaml
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/notes/fix_endpoint_region-0fa0d89061ebaf12.yaml
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/notes/fix_openrc_v2-64049769daf57b65.yaml
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/notes/hash_domains-d6a867466bcf324b.yaml
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/notes/ipv6_provider-796b60badd356e59.yaml
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/notes/keystone-wsgi-scripts-0d772d1f9f2d6c57.yaml
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/notes/keystone_bootstrap-4bf00198001d3350.yaml
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/notes/keystone_hooks_support-2c9e8b09bdbd1b5b.yaml
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/notes/keystone_identity_provider-9b6f6b3ad70c60f3.yaml
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/notes/keystone_python_depr-80fa804d9cd242c5.yaml
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/notes/manage_ldap_packages-3b739e338f3e59c2.yaml
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/notes/multi_domain_configuration-32dc8cbef450f1d6.yaml
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/notes/multi_ldap-975858a46dd622a6.yaml
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/notes/os_service_default-9caeeb340d4bb303.yaml
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/notes/policy_driver-c991dd693d2336fc.yaml
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/notes/policy_rc_d_keystone_eventlet-2dc65eb3d27f8969.yaml
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/notes/remove_unused_class-0615d6744896ad97.yaml
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/notes/stop_posix_and_files-930ee921d0ebead2.yaml
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/notes/support_multi_domain-bd04f18aa7913eaa.yaml
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/source/_static/.placeholder
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/source/conf.py
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/source/index.rst
+file path=usr/puppetlabs/puppet/modules/keystone/releasenotes/source/unreleased.rst
+file path=usr/puppetlabs/puppet/modules/keystone/setup.cfg
+file path=usr/puppetlabs/puppet/modules/keystone/setup.py
+file path=usr/puppetlabs/puppet/modules/keystone/spec/acceptance/default_domain_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/acceptance/keystone_federation_identity_provider_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/acceptance/keystone_federation_shibboleth_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/acceptance/keystone_wsgi_apache_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/acceptance/nodesets/centos-70-x64.yml
+file path=usr/puppetlabs/puppet/modules/keystone/spec/acceptance/nodesets/default.yml
+file path=usr/puppetlabs/puppet/modules/keystone/spec/acceptance/nodesets/nodepool-centos7.yml
+file path=usr/puppetlabs/puppet/modules/keystone/spec/acceptance/nodesets/nodepool-trusty.yml
+file path=usr/puppetlabs/puppet/modules/keystone/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+file path=usr/puppetlabs/puppet/modules/keystone/spec/classes/keystone_client_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/classes/keystone_cron_token_flush_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/classes/keystone_db_mysql_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/classes/keystone_db_postgresql_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/classes/keystone_db_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/classes/keystone_db_sync_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/classes/keystone_deps_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/classes/keystone_disable_admin_token_auth_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/classes/keystone_endpoint_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/classes/keystone_federation_identity_provider_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/classes/keystone_federation_mellon.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/classes/keystone_federation_shibboleth.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/classes/keystone_ldap_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/classes/keystone_logging_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/classes/keystone_policy_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/classes/keystone_roles_admin_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/classes/keystone_service_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/classes/keystone_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/classes/keystone_wsgi_apache_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/defines/keystone_ldap_backend_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/defines/keystone_resource_authtoken_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/defines/keystone_resource_service_identity_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/shared_examples.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/shared_examples_acceptance.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/spec.opts
+file path=usr/puppetlabs/puppet/modules/keystone/spec/spec_helper.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/spec_helper_acceptance.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/unit/provider/keystone/util_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/unit/provider/keystone_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/unit/provider/keystone_domain/openstack_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/unit/provider/keystone_domain_config/openstack_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/unit/provider/keystone_endpoint/openstack_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/unit/provider/keystone_identity_provider/openstack_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/unit/provider/keystone_paste_ini/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/unit/provider/keystone_role/openstack_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/unit/provider/keystone_service/openstack_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/unit/provider/keystone_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/unit/provider/keystone_tenant/openstack_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/unit/provider/keystone_user/openstack_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/unit/provider/keystone_user_role/openstack_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/unit/type/keystone_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/unit/type/keystone_domain_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/unit/type/keystone_endpoint_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/unit/type/keystone_identity_provider_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/unit/type/keystone_paste_ini_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/unit/type/keystone_service_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/unit/type/keystone_tenant_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/unit/type/keystone_user_role_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/spec/unit/type/keystone_user_spec.rb
+file path=usr/puppetlabs/puppet/modules/keystone/templates/mellon.conf.erb
+file path=usr/puppetlabs/puppet/modules/keystone/templates/shibboleth.conf.erb
+file path=usr/puppetlabs/puppet/modules/keystone/test-requirements.txt
+file path=usr/puppetlabs/puppet/modules/keystone/tests/site.pp
+file path=usr/puppetlabs/puppet/modules/keystone/tox.ini
 #
 license openstack-keystone.license license="Apache v2.0"
 
--- a/components/ruby/puppet-modules/openstack-keystone/patches/01-metadata.patch	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet-modules/openstack-keystone/patches/01-metadata.patch	Mon Nov 28 16:54:02 2016 -0800
@@ -2,20 +2,20 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-keystone-8.2.0/metadata.json.orig   2016-08-07 11:18:04.925303225 -0700
-+++ openstack-keystone-8.2.0/metadata.json       2016-08-07 11:18:27.324583279 -0700
-@@ -30,6 +30,13 @@
+diff --git a/metadata.json b/metadata.json
+--- a/metadata.json
++++ b/metadata.json
+@@ -29,6 +29,13 @@
+       "operatingsystemrelease": [
          "14.04"
        ]
-     }
++    },
 +    {
 +      "operatingsystem": "Solaris",
 +      "operatingsystemrelease": [
 +        "12.0",
 +        "11.3"
 +      ]
-+    }
+     }
    ],
    "description": "Installs and configures OpenStack Keystone (Identity).",
-   "dependencies": [
-
--- a/components/ruby/puppet-modules/openstack-neutron/openstack-neutron.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet-modules/openstack-neutron/openstack-neutron.p5m	Mon Nov 28 16:54:02 2016 -0800
@@ -35,291 +35,291 @@
     value="org.opensolaris.category.2008:System/Enterprise Management"
 set name=info.upstream value="OpenStack <[email protected]>"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2016/001
+set name=org.opensolaris.arc-caseid value=PSARC/2016/001 value=PSARC/2016/607
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file path=etc/puppet/modules/neutron/CHANGELOG.md
-file path=etc/puppet/modules/neutron/Gemfile
-file path=etc/puppet/modules/neutron/LICENSE
-file path=etc/puppet/modules/neutron/README.md
-file path=etc/puppet/modules/neutron/Rakefile
-file path=etc/puppet/modules/neutron/checksums.json
-file path=etc/puppet/modules/neutron/examples/base_provision.pp
-file path=etc/puppet/modules/neutron/examples/cisco_ml2.pp
-file path=etc/puppet/modules/neutron/examples/create_network.sh
-file path=etc/puppet/modules/neutron/examples/neutron.pp
-file path=etc/puppet/modules/neutron/examples/neutron_l3_with_to_uuid.pp
-file path=etc/puppet/modules/neutron/examples/neutron_with_pacemaker.pp
-file path=etc/puppet/modules/neutron/lib/puppet/parser/functions/validate_network_vlan_ranges.rb
-file path=etc/puppet/modules/neutron/lib/puppet/parser/functions/validate_tunnel_id_ranges.rb
-file path=etc/puppet/modules/neutron/lib/puppet/parser/functions/validate_vni_ranges.rb
-file path=etc/puppet/modules/neutron/lib/puppet/parser/functions/validate_vxlan_udp_port.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_agent_linuxbridge/ini_setting.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_agent_ovs/ini_setting.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_api_config/ini_setting.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_api_paste_ini/ini_setting.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_config/openstackconfig.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_dhcp_agent_config/ini_setting.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_fwaas_service_config/ini_setting.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_l3_agent_config/ini_setting.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_l3_ovs_bridge/neutron.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_lbaas_agent_config/ini_setting.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_lbaas_service_config/openstackconfig.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_metadata_agent_config/ini_setting.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_metering_agent_config/ini_setting.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_network/neutron.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_cisco/ini_setting.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_cisco_credentials/ini_setting.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_cisco_db_conn/ini_setting.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_cisco_l2network/ini_setting.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_linuxbridge/ini_setting.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_midonet/ini_setting.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_ml2/ini_setting.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_nuage/ini_setting.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_nvp/ini_setting.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_opencontrail/ini_setting.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_plumgrid/ini_setting.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_sriov/ini_setting.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_plumlib_plumgrid/ini_setting.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_port/neutron.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_router/neutron.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_router_interface/neutron.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_sriov_agent_config/ini_setting.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_subnet/neutron.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_vpnaas_agent_config/ini_setting.rb
-file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_vpnaas_service_config/openstackconfig.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_agent_linuxbridge.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_agent_ovs.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_api_config.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_api_paste_ini.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_config.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_dhcp_agent_config.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_fwaas_service_config.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_l3_agent_config.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_l3_ovs_bridge.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_lbaas_agent_config.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_lbaas_service_config.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_metadata_agent_config.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_metering_agent_config.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_network.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_plugin_cisco.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_plugin_cisco_credentials.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_plugin_cisco_db_conn.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_plugin_cisco_l2network.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_plugin_linuxbridge.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_plugin_midonet.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_plugin_ml2.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_plugin_nuage.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_plugin_nvp.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_plugin_opencontrail.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_plugin_plumgrid.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_plugin_sriov.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_plumlib_plumgrid.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_port.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_router.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_router_interface.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_sriov_agent_config.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_subnet.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_vpnaas_agent_config.rb
-file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_vpnaas_service_config.rb
-file path=etc/puppet/modules/neutron/manifests/agents/bigswitch.pp
-file path=etc/puppet/modules/neutron/manifests/agents/dhcp.pp
-file path=etc/puppet/modules/neutron/manifests/agents/l3.pp
-file path=etc/puppet/modules/neutron/manifests/agents/lbaas.pp
-file path=etc/puppet/modules/neutron/manifests/agents/metadata.pp
-file path=etc/puppet/modules/neutron/manifests/agents/metering.pp
-file path=etc/puppet/modules/neutron/manifests/agents/ml2/linuxbridge.pp
-file path=etc/puppet/modules/neutron/manifests/agents/ml2/ovs.pp
-file path=etc/puppet/modules/neutron/manifests/agents/ml2/sriov.pp
-file path=etc/puppet/modules/neutron/manifests/agents/n1kv_vem.pp
-file path=etc/puppet/modules/neutron/manifests/agents/vpnaas.pp
-file path=etc/puppet/modules/neutron/manifests/client.pp
-file path=etc/puppet/modules/neutron/manifests/config.pp
-file path=etc/puppet/modules/neutron/manifests/db.pp
-file path=etc/puppet/modules/neutron/manifests/db/mysql.pp
-file path=etc/puppet/modules/neutron/manifests/db/postgresql.pp
-file path=etc/puppet/modules/neutron/manifests/db/sync.pp
-file path=etc/puppet/modules/neutron/manifests/init.pp
-file path=etc/puppet/modules/neutron/manifests/keystone/auth.pp
-file path=etc/puppet/modules/neutron/manifests/params.pp
-file path=etc/puppet/modules/neutron/manifests/plugins/cisco.pp
-file path=etc/puppet/modules/neutron/manifests/plugins/midonet.pp
-file path=etc/puppet/modules/neutron/manifests/plugins/ml2.pp
-file path=etc/puppet/modules/neutron/manifests/plugins/ml2/arista.pp
-file path=etc/puppet/modules/neutron/manifests/plugins/ml2/arista/l3.pp
-file path=etc/puppet/modules/neutron/manifests/plugins/ml2/bigswitch.pp
-file path=etc/puppet/modules/neutron/manifests/plugins/ml2/bigswitch/restproxy.pp
-file path=etc/puppet/modules/neutron/manifests/plugins/ml2/cisco.pp
-file path=etc/puppet/modules/neutron/manifests/plugins/ml2/cisco/nexus.pp
-file path=etc/puppet/modules/neutron/manifests/plugins/ml2/cisco/nexus1000v.pp
-file path=etc/puppet/modules/neutron/manifests/plugins/ml2/cisco/nexus_creds.pp
-file path=etc/puppet/modules/neutron/manifests/plugins/ml2/cisco/nexus_switch.pp
-file path=etc/puppet/modules/neutron/manifests/plugins/ml2/cisco/nexus_switch_server.pp
-file path=etc/puppet/modules/neutron/manifests/plugins/ml2/cisco/type_nexus_vxlan.pp
-file path=etc/puppet/modules/neutron/manifests/plugins/ml2/cisco/ucsm.pp
-file path=etc/puppet/modules/neutron/manifests/plugins/ml2/mech_driver.pp
-file path=etc/puppet/modules/neutron/manifests/plugins/ml2/midonet.pp
-file path=etc/puppet/modules/neutron/manifests/plugins/ml2/opendaylight.pp
-file path=etc/puppet/modules/neutron/manifests/plugins/ml2/type_driver.pp
-file path=etc/puppet/modules/neutron/manifests/plugins/nuage.pp
-file path=etc/puppet/modules/neutron/manifests/plugins/nvp.pp
-file path=etc/puppet/modules/neutron/manifests/plugins/opencontrail.pp
-file path=etc/puppet/modules/neutron/manifests/plugins/ovs/bridge.pp
-file path=etc/puppet/modules/neutron/manifests/plugins/ovs/opendaylight.pp
-file path=etc/puppet/modules/neutron/manifests/plugins/ovs/port.pp
-file path=etc/puppet/modules/neutron/manifests/plugins/plumgrid.pp
-file path=etc/puppet/modules/neutron/manifests/policy.pp
-file path=etc/puppet/modules/neutron/manifests/quota.pp
-file path=etc/puppet/modules/neutron/manifests/server.pp
-file path=etc/puppet/modules/neutron/manifests/server/notifications.pp
-file path=etc/puppet/modules/neutron/manifests/services/fwaas.pp
-file path=etc/puppet/modules/neutron/manifests/services/lbaas.pp
-file path=etc/puppet/modules/neutron/manifests/services/lbaas/haproxy.pp
-file path=etc/puppet/modules/neutron/manifests/services/lbaas/octavia.pp
-file path=etc/puppet/modules/neutron/manifests/services/vpnaas.pp
-file path=etc/puppet/modules/neutron/metadata.json
-file path=etc/puppet/modules/neutron/releasenotes/notes/add_dnsmasq_dns_servers-2dd26f5c9383f836.yaml
-file path=etc/puppet/modules/neutron/releasenotes/notes/add_geneve_type_driver_configs-e285075b3238b49d.yaml
-file path=etc/puppet/modules/neutron/releasenotes/notes/add_lbaas_driver_package_to_lbaas_services_class-8d0f51e7be9b5f42.yaml
-file path=etc/puppet/modules/neutron/releasenotes/notes/add_name_to_uuid_transform.yaml
-file path=etc/puppet/modules/neutron/releasenotes/notes/added_arista_ml2_plugin-8bfd0c41981dac50.yaml
-file path=etc/puppet/modules/neutron/releasenotes/notes/api_paste-b94e191896840944.yaml
-file path=etc/puppet/modules/neutron/releasenotes/notes/consolidate_service_provider_configuration-3ce48947a396ad25.yaml
-file path=etc/puppet/modules/neutron/releasenotes/notes/deprecate_network_device_mtu-d7f15c98605ac2fb.yaml
-file path=etc/puppet/modules/neutron/releasenotes/notes/fix_lb_driver-d429a30889ef8f22.yaml
-file path=etc/puppet/modules/neutron/releasenotes/notes/lbaasv2_agent_and_service-ca5e38a07566ad1e.yaml
-file path=etc/puppet/modules/neutron/releasenotes/notes/missing_firewall_driver_ml2-24b48831f2d0e62b.yaml
-file path=etc/puppet/modules/neutron/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
-file path=etc/puppet/modules/neutron/releasenotes/notes/mitaka_aas-e5243eaac2354e85.yaml
-file path=etc/puppet/modules/neutron/releasenotes/notes/mitaka_drivers-8c41f528f346a388.yaml
-file path=etc/puppet/modules/neutron/releasenotes/notes/mitaka_metadata-77ebc004c9064934.yaml
-file path=etc/puppet/modules/neutron/releasenotes/notes/mitaka_providers-040ac57a732b1e82.yaml
-file path=etc/puppet/modules/neutron/releasenotes/notes/neutron_availability_zones-80246c2af9a7be08.yaml
-file path=etc/puppet/modules/neutron/releasenotes/notes/new_auth-2331a620217ccf7c.yaml
-file path=etc/puppet/modules/neutron/releasenotes/notes/pymysql-e57bf1f0289dd426.yaml
-file path=etc/puppet/modules/neutron/releasenotes/notes/qos-13c0b72fe9a5b502.yaml
-file path=etc/puppet/modules/neutron/releasenotes/notes/remove_qpid-0b446db43fdea617.yaml
-file path=etc/puppet/modules/neutron/releasenotes/notes/update_plumgrid_config-82f3f631917f0e50.yaml
-file path=etc/puppet/modules/neutron/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
-file path=etc/puppet/modules/neutron/releasenotes/source/_static/.placeholder
-file path=etc/puppet/modules/neutron/releasenotes/source/conf.py
-file path=etc/puppet/modules/neutron/releasenotes/source/index.rst
-file path=etc/puppet/modules/neutron/releasenotes/source/mitaka.rst
-file path=etc/puppet/modules/neutron/releasenotes/source/unreleased.rst
-file path=etc/puppet/modules/neutron/setup.cfg
-file path=etc/puppet/modules/neutron/setup.py
-file path=etc/puppet/modules/neutron/spec/acceptance/basic_neutron_spec.rb
-file path=etc/puppet/modules/neutron/spec/acceptance/neutron_config_spec.rb
-file path=etc/puppet/modules/neutron/spec/acceptance/nodesets/centos-70-x64.yml
-file path=etc/puppet/modules/neutron/spec/acceptance/nodesets/default.yml
-file path=etc/puppet/modules/neutron/spec/acceptance/nodesets/nodepool-centos7.yml
-file path=etc/puppet/modules/neutron/spec/acceptance/nodesets/nodepool-trusty.yml
-file path=etc/puppet/modules/neutron/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
-file path=etc/puppet/modules/neutron/spec/classes/neutron_agents_bigswitch.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_agents_dhcp_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_agents_l3_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_agents_lbaas_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_agents_metadata_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_agents_metering_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_agents_ml2_linuxbridge_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_agents_ml2_ovs_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_agents_ml2_sriov_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_agents_n1kv_vem_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_agents_vpnaas_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_client_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_db_mysql_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_db_postgresql_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_db_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_db_sync_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_init_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_keystone_auth_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_cisco_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_midonet_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_arista_l3_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_arista_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_bigswitch_restproxy_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_bigswitch_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_cisco_nexus1000v_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_cisco_nexus_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_cisco_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_cisco_type_nexus_vxlan_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_cisco_ucsm_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_midonet_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_opendaylight_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_nuage_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_nvp_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_opencontrail_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_ovs_opendaylight_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_plumgrid_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_policy_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_quota_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_server_notifications_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_server_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_services_fwaas_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_services_lbaas_haproxy_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_services_lbaas_octavia_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_services_lbaas_spec.rb
-file path=etc/puppet/modules/neutron/spec/classes/neutron_services_vpnaas_spec.rb
-file path=etc/puppet/modules/neutron/spec/shared_examples.rb
-file path=etc/puppet/modules/neutron/spec/spec_helper.rb
-file path=etc/puppet/modules/neutron/spec/spec_helper_acceptance.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_agent_linuxbridge/ini_setting_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_agent_ovs/ini_setting_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_api_config/ini_setting_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_api_paste_ini/ini_setting_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_dhcp_agent_config/ini_setting_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_fwaas_service_config/ini_setting_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_l3_agent_config/ini_setting_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_l3_ovs_bridge/neutron_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_lbaas_agent_config/ini_setting_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_metadata_agent_config/ini_setting_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_metering_agent_config/ini_setting_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_network/neutron_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_plugin_cisco/ini_setting_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_plugin_cisco_credentials/ini_setting_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_plugin_cisco_db_conn/ini_setting_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_plugin_cisco_l2network/ini_setting_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_plugin_midonet/ini_setting_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_plugin_ml2/ini_setting_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_plugin_nuage/ini_setting_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_plugin_nvp/ini_setting_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_plugin_opencontrail/ini_setting_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_plugin_plumgrid/ini_setting_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_plumlib_plumgrid/ini_setting_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_port/neutron_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_router/neutron_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_router_interface/neutron_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_router_interface/new_neutron_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_subnet/neutron_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_vpnaas_agent_config/ini_setting_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/type/neutron_agent_linuxbridge_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/type/neutron_agent_ovs_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/type/neutron_api_paste_ini_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/type/neutron_config_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/type/neutron_dhcp_agent_config_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/type/neutron_fwaas_service_config_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/type/neutron_l3_agent_config_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/type/neutron_lbaas_agent_config_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/type/neutron_metadata_agent_config_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/type/neutron_metering_agent_config_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/type/neutron_plugin_cisco_credentials_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/type/neutron_plugin_cisco_db_conn_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/type/neutron_plugin_cisco_l2network_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/type/neutron_plugin_cisco_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/type/neutron_plugin_midonet_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/type/neutron_plugin_ml2_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/type/neutron_plugin_nvp_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/type/neutron_plugin_opencontrail_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/type/neutron_plugin_plumgrid_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/type/neutron_plumlib_plumgrid_spec.rb
-file path=etc/puppet/modules/neutron/spec/unit/type/neutron_subnet.rb
-file path=etc/puppet/modules/neutron/spec/unit/type/neutron_vpnaas_agent_config_spec.rb
-file path=etc/puppet/modules/neutron/templates/n1kv.conf.erb
-file path=etc/puppet/modules/neutron/test-requirements.txt
-file path=etc/puppet/modules/neutron/tox.ini
+file path=usr/puppetlabs/puppet/modules/neutron/CHANGELOG.md
+file path=usr/puppetlabs/puppet/modules/neutron/Gemfile
+file path=usr/puppetlabs/puppet/modules/neutron/LICENSE
+file path=usr/puppetlabs/puppet/modules/neutron/README.md
+file path=usr/puppetlabs/puppet/modules/neutron/Rakefile
+file path=usr/puppetlabs/puppet/modules/neutron/checksums.json
+file path=usr/puppetlabs/puppet/modules/neutron/examples/base_provision.pp
+file path=usr/puppetlabs/puppet/modules/neutron/examples/cisco_ml2.pp
+file path=usr/puppetlabs/puppet/modules/neutron/examples/create_network.sh
+file path=usr/puppetlabs/puppet/modules/neutron/examples/neutron.pp
+file path=usr/puppetlabs/puppet/modules/neutron/examples/neutron_l3_with_to_uuid.pp
+file path=usr/puppetlabs/puppet/modules/neutron/examples/neutron_with_pacemaker.pp
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/parser/functions/validate_network_vlan_ranges.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/parser/functions/validate_tunnel_id_ranges.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/parser/functions/validate_vni_ranges.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/parser/functions/validate_vxlan_udp_port.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_agent_linuxbridge/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_agent_ovs/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_api_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_api_paste_ini/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_config/openstackconfig.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_dhcp_agent_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_fwaas_service_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_l3_agent_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_l3_ovs_bridge/neutron.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_lbaas_agent_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_lbaas_service_config/openstackconfig.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_metadata_agent_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_metering_agent_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_network/neutron.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_cisco/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_cisco_credentials/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_cisco_db_conn/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_cisco_l2network/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_linuxbridge/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_midonet/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_ml2/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_nuage/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_nvp/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_opencontrail/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_plumgrid/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_sriov/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_plumlib_plumgrid/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_port/neutron.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_router/neutron.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_router_interface/neutron.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_sriov_agent_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_subnet/neutron.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_vpnaas_agent_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/provider/neutron_vpnaas_service_config/openstackconfig.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_agent_linuxbridge.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_agent_ovs.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_api_config.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_api_paste_ini.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_config.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_dhcp_agent_config.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_fwaas_service_config.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_l3_agent_config.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_l3_ovs_bridge.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_lbaas_agent_config.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_lbaas_service_config.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_metadata_agent_config.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_metering_agent_config.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_network.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_plugin_cisco.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_plugin_cisco_credentials.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_plugin_cisco_db_conn.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_plugin_cisco_l2network.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_plugin_linuxbridge.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_plugin_midonet.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_plugin_ml2.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_plugin_nuage.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_plugin_nvp.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_plugin_opencontrail.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_plugin_plumgrid.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_plugin_sriov.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_plumlib_plumgrid.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_port.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_router.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_router_interface.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_sriov_agent_config.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_subnet.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_vpnaas_agent_config.rb
+file path=usr/puppetlabs/puppet/modules/neutron/lib/puppet/type/neutron_vpnaas_service_config.rb
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/agents/bigswitch.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/agents/dhcp.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/agents/l3.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/agents/lbaas.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/agents/metadata.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/agents/metering.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/agents/ml2/linuxbridge.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/agents/ml2/ovs.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/agents/ml2/sriov.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/agents/n1kv_vem.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/agents/vpnaas.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/client.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/config.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/db.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/db/mysql.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/db/postgresql.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/db/sync.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/init.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/keystone/auth.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/params.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/plugins/cisco.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/plugins/midonet.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/plugins/ml2.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/plugins/ml2/arista.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/plugins/ml2/arista/l3.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/plugins/ml2/bigswitch.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/plugins/ml2/bigswitch/restproxy.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/plugins/ml2/cisco.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/plugins/ml2/cisco/nexus.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/plugins/ml2/cisco/nexus1000v.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/plugins/ml2/cisco/nexus_creds.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/plugins/ml2/cisco/nexus_switch.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/plugins/ml2/cisco/nexus_switch_server.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/plugins/ml2/cisco/type_nexus_vxlan.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/plugins/ml2/cisco/ucsm.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/plugins/ml2/mech_driver.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/plugins/ml2/midonet.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/plugins/ml2/opendaylight.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/plugins/ml2/type_driver.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/plugins/nuage.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/plugins/nvp.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/plugins/opencontrail.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/plugins/ovs/bridge.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/plugins/ovs/opendaylight.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/plugins/ovs/port.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/plugins/plumgrid.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/policy.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/quota.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/server.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/server/notifications.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/services/fwaas.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/services/lbaas.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/services/lbaas/haproxy.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/services/lbaas/octavia.pp
+file path=usr/puppetlabs/puppet/modules/neutron/manifests/services/vpnaas.pp
+file path=usr/puppetlabs/puppet/modules/neutron/metadata.json
+file path=usr/puppetlabs/puppet/modules/neutron/releasenotes/notes/add_dnsmasq_dns_servers-2dd26f5c9383f836.yaml
+file path=usr/puppetlabs/puppet/modules/neutron/releasenotes/notes/add_geneve_type_driver_configs-e285075b3238b49d.yaml
+file path=usr/puppetlabs/puppet/modules/neutron/releasenotes/notes/add_lbaas_driver_package_to_lbaas_services_class-8d0f51e7be9b5f42.yaml
+file path=usr/puppetlabs/puppet/modules/neutron/releasenotes/notes/add_name_to_uuid_transform.yaml
+file path=usr/puppetlabs/puppet/modules/neutron/releasenotes/notes/added_arista_ml2_plugin-8bfd0c41981dac50.yaml
+file path=usr/puppetlabs/puppet/modules/neutron/releasenotes/notes/api_paste-b94e191896840944.yaml
+file path=usr/puppetlabs/puppet/modules/neutron/releasenotes/notes/consolidate_service_provider_configuration-3ce48947a396ad25.yaml
+file path=usr/puppetlabs/puppet/modules/neutron/releasenotes/notes/deprecate_network_device_mtu-d7f15c98605ac2fb.yaml
+file path=usr/puppetlabs/puppet/modules/neutron/releasenotes/notes/fix_lb_driver-d429a30889ef8f22.yaml
+file path=usr/puppetlabs/puppet/modules/neutron/releasenotes/notes/lbaasv2_agent_and_service-ca5e38a07566ad1e.yaml
+file path=usr/puppetlabs/puppet/modules/neutron/releasenotes/notes/missing_firewall_driver_ml2-24b48831f2d0e62b.yaml
+file path=usr/puppetlabs/puppet/modules/neutron/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
+file path=usr/puppetlabs/puppet/modules/neutron/releasenotes/notes/mitaka_aas-e5243eaac2354e85.yaml
+file path=usr/puppetlabs/puppet/modules/neutron/releasenotes/notes/mitaka_drivers-8c41f528f346a388.yaml
+file path=usr/puppetlabs/puppet/modules/neutron/releasenotes/notes/mitaka_metadata-77ebc004c9064934.yaml
+file path=usr/puppetlabs/puppet/modules/neutron/releasenotes/notes/mitaka_providers-040ac57a732b1e82.yaml
+file path=usr/puppetlabs/puppet/modules/neutron/releasenotes/notes/neutron_availability_zones-80246c2af9a7be08.yaml
+file path=usr/puppetlabs/puppet/modules/neutron/releasenotes/notes/new_auth-2331a620217ccf7c.yaml
+file path=usr/puppetlabs/puppet/modules/neutron/releasenotes/notes/pymysql-e57bf1f0289dd426.yaml
+file path=usr/puppetlabs/puppet/modules/neutron/releasenotes/notes/qos-13c0b72fe9a5b502.yaml
+file path=usr/puppetlabs/puppet/modules/neutron/releasenotes/notes/remove_qpid-0b446db43fdea617.yaml
+file path=usr/puppetlabs/puppet/modules/neutron/releasenotes/notes/update_plumgrid_config-82f3f631917f0e50.yaml
+file path=usr/puppetlabs/puppet/modules/neutron/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
+file path=usr/puppetlabs/puppet/modules/neutron/releasenotes/source/_static/.placeholder
+file path=usr/puppetlabs/puppet/modules/neutron/releasenotes/source/conf.py
+file path=usr/puppetlabs/puppet/modules/neutron/releasenotes/source/index.rst
+file path=usr/puppetlabs/puppet/modules/neutron/releasenotes/source/mitaka.rst
+file path=usr/puppetlabs/puppet/modules/neutron/releasenotes/source/unreleased.rst
+file path=usr/puppetlabs/puppet/modules/neutron/setup.cfg
+file path=usr/puppetlabs/puppet/modules/neutron/setup.py
+file path=usr/puppetlabs/puppet/modules/neutron/spec/acceptance/basic_neutron_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/acceptance/neutron_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/acceptance/nodesets/centos-70-x64.yml
+file path=usr/puppetlabs/puppet/modules/neutron/spec/acceptance/nodesets/default.yml
+file path=usr/puppetlabs/puppet/modules/neutron/spec/acceptance/nodesets/nodepool-centos7.yml
+file path=usr/puppetlabs/puppet/modules/neutron/spec/acceptance/nodesets/nodepool-trusty.yml
+file path=usr/puppetlabs/puppet/modules/neutron/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_agents_bigswitch.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_agents_dhcp_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_agents_l3_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_agents_lbaas_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_agents_metadata_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_agents_metering_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_agents_ml2_linuxbridge_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_agents_ml2_ovs_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_agents_ml2_sriov_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_agents_n1kv_vem_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_agents_vpnaas_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_client_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_db_mysql_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_db_postgresql_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_db_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_db_sync_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_init_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_keystone_auth_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_plugins_cisco_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_plugins_midonet_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_arista_l3_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_arista_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_bigswitch_restproxy_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_bigswitch_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_cisco_nexus1000v_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_cisco_nexus_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_cisco_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_cisco_type_nexus_vxlan_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_cisco_ucsm_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_midonet_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_opendaylight_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_plugins_nuage_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_plugins_nvp_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_plugins_opencontrail_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_plugins_ovs_opendaylight_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_plugins_plumgrid_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_policy_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_quota_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_server_notifications_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_server_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_services_fwaas_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_services_lbaas_haproxy_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_services_lbaas_octavia_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_services_lbaas_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/classes/neutron_services_vpnaas_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/shared_examples.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/spec_helper.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/spec_helper_acceptance.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_agent_linuxbridge/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_agent_ovs/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_api_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_api_paste_ini/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_dhcp_agent_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_fwaas_service_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_l3_agent_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_l3_ovs_bridge/neutron_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_lbaas_agent_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_metadata_agent_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_metering_agent_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_network/neutron_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_plugin_cisco/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_plugin_cisco_credentials/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_plugin_cisco_db_conn/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_plugin_cisco_l2network/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_plugin_midonet/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_plugin_ml2/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_plugin_nuage/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_plugin_nvp/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_plugin_opencontrail/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_plugin_plumgrid/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_plumlib_plumgrid/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_port/neutron_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_router/neutron_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_router_interface/neutron_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_router_interface/new_neutron_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_subnet/neutron_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/provider/neutron_vpnaas_agent_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/type/neutron_agent_linuxbridge_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/type/neutron_agent_ovs_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/type/neutron_api_paste_ini_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/type/neutron_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/type/neutron_dhcp_agent_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/type/neutron_fwaas_service_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/type/neutron_l3_agent_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/type/neutron_lbaas_agent_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/type/neutron_metadata_agent_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/type/neutron_metering_agent_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/type/neutron_plugin_cisco_credentials_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/type/neutron_plugin_cisco_db_conn_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/type/neutron_plugin_cisco_l2network_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/type/neutron_plugin_cisco_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/type/neutron_plugin_midonet_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/type/neutron_plugin_ml2_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/type/neutron_plugin_nvp_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/type/neutron_plugin_opencontrail_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/type/neutron_plugin_plumgrid_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/type/neutron_plumlib_plumgrid_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/type/neutron_subnet.rb
+file path=usr/puppetlabs/puppet/modules/neutron/spec/unit/type/neutron_vpnaas_agent_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/neutron/templates/n1kv.conf.erb
+file path=usr/puppetlabs/puppet/modules/neutron/test-requirements.txt
+file path=usr/puppetlabs/puppet/modules/neutron/tox.ini
 #
 license openstack-neutron.license license="Apache v2.0"
 
--- a/components/ruby/puppet-modules/openstack-nova/openstack-nova.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet-modules/openstack-nova/openstack-nova.p5m	Mon Nov 28 16:54:02 2016 -0800
@@ -35,186 +35,186 @@
     value="org.opensolaris.category.2008:System/Enterprise Management"
 set name=info.upstream value="OpenStack <[email protected]>"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2016/001
+set name=org.opensolaris.arc-caseid value=PSARC/2016/001 value=PSARC/2016/607
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file path=etc/puppet/modules/nova/CHANGELOG.md
-file path=etc/puppet/modules/nova/Gemfile
-file path=etc/puppet/modules/nova/LICENSE
-file path=etc/puppet/modules/nova/README.md
-file path=etc/puppet/modules/nova/Rakefile
-file path=etc/puppet/modules/nova/checksums.json
-file path=etc/puppet/modules/nova/examples/nova_with_pacemaker.pp
-file path=etc/puppet/modules/nova/examples/nova_wsgi.pp
-file path=etc/puppet/modules/nova/lib/facter/libvirt_uuid.rb
-file path=etc/puppet/modules/nova/lib/puppet/parser/functions/check_array_of_hash.rb
-file path=etc/puppet/modules/nova/lib/puppet/provider/nova.rb
-file path=etc/puppet/modules/nova/lib/puppet/provider/nova_aggregate/nova.rb
-file path=etc/puppet/modules/nova/lib/puppet/provider/nova_cells/nova_manage.rb
-file path=etc/puppet/modules/nova/lib/puppet/provider/nova_config/ini_setting.rb
-file path=etc/puppet/modules/nova/lib/puppet/provider/nova_floating/nova_manage.rb
-file path=etc/puppet/modules/nova/lib/puppet/provider/nova_network/nova.rb
-file path=etc/puppet/modules/nova/lib/puppet/provider/nova_paste_api_ini/ini_setting.rb
-file path=etc/puppet/modules/nova/lib/puppet/provider/nova_security_group/nova.rb
-file path=etc/puppet/modules/nova/lib/puppet/provider/nova_security_rule/nova.rb
-file path=etc/puppet/modules/nova/lib/puppet/type/nova_aggregate.rb
-file path=etc/puppet/modules/nova/lib/puppet/type/nova_cells.rb
-file path=etc/puppet/modules/nova/lib/puppet/type/nova_config.rb
-file path=etc/puppet/modules/nova/lib/puppet/type/nova_floating.rb
-file path=etc/puppet/modules/nova/lib/puppet/type/nova_network.rb
-file path=etc/puppet/modules/nova/lib/puppet/type/nova_paste_api_ini.rb
-file path=etc/puppet/modules/nova/lib/puppet/type/nova_security_group.rb
-file path=etc/puppet/modules/nova/lib/puppet/type/nova_security_rule.rb
-file path=etc/puppet/modules/nova/manifests/api.pp
-file path=etc/puppet/modules/nova/manifests/availability_zone.pp
-file path=etc/puppet/modules/nova/manifests/cells.pp
-file path=etc/puppet/modules/nova/manifests/cert.pp
-file path=etc/puppet/modules/nova/manifests/client.pp
-file path=etc/puppet/modules/nova/manifests/compute.pp
-file path=etc/puppet/modules/nova/manifests/compute/ironic.pp
-file path=etc/puppet/modules/nova/manifests/compute/libvirt.pp
-file path=etc/puppet/modules/nova/manifests/compute/neutron.pp
-file path=etc/puppet/modules/nova/manifests/compute/rbd.pp
-file path=etc/puppet/modules/nova/manifests/compute/serial.pp
+file path=usr/puppetlabs/puppet/modules/nova/CHANGELOG.md
+file path=usr/puppetlabs/puppet/modules/nova/Gemfile
+file path=usr/puppetlabs/puppet/modules/nova/LICENSE
+file path=usr/puppetlabs/puppet/modules/nova/README.md
+file path=usr/puppetlabs/puppet/modules/nova/Rakefile
+file path=usr/puppetlabs/puppet/modules/nova/checksums.json
+file path=usr/puppetlabs/puppet/modules/nova/examples/nova_with_pacemaker.pp
+file path=usr/puppetlabs/puppet/modules/nova/examples/nova_wsgi.pp
+file path=usr/puppetlabs/puppet/modules/nova/lib/facter/libvirt_uuid.rb
+file path=usr/puppetlabs/puppet/modules/nova/lib/puppet/parser/functions/check_array_of_hash.rb
+file path=usr/puppetlabs/puppet/modules/nova/lib/puppet/provider/nova.rb
+file path=usr/puppetlabs/puppet/modules/nova/lib/puppet/provider/nova_aggregate/nova.rb
+file path=usr/puppetlabs/puppet/modules/nova/lib/puppet/provider/nova_cells/nova_manage.rb
+file path=usr/puppetlabs/puppet/modules/nova/lib/puppet/provider/nova_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/nova/lib/puppet/provider/nova_floating/nova_manage.rb
+file path=usr/puppetlabs/puppet/modules/nova/lib/puppet/provider/nova_network/nova.rb
+file path=usr/puppetlabs/puppet/modules/nova/lib/puppet/provider/nova_paste_api_ini/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/nova/lib/puppet/provider/nova_security_group/nova.rb
+file path=usr/puppetlabs/puppet/modules/nova/lib/puppet/provider/nova_security_rule/nova.rb
+file path=usr/puppetlabs/puppet/modules/nova/lib/puppet/type/nova_aggregate.rb
+file path=usr/puppetlabs/puppet/modules/nova/lib/puppet/type/nova_cells.rb
+file path=usr/puppetlabs/puppet/modules/nova/lib/puppet/type/nova_config.rb
+file path=usr/puppetlabs/puppet/modules/nova/lib/puppet/type/nova_floating.rb
+file path=usr/puppetlabs/puppet/modules/nova/lib/puppet/type/nova_network.rb
+file path=usr/puppetlabs/puppet/modules/nova/lib/puppet/type/nova_paste_api_ini.rb
+file path=usr/puppetlabs/puppet/modules/nova/lib/puppet/type/nova_security_group.rb
+file path=usr/puppetlabs/puppet/modules/nova/lib/puppet/type/nova_security_rule.rb
+file path=usr/puppetlabs/puppet/modules/nova/manifests/api.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/availability_zone.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/cells.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/cert.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/client.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/compute.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/compute/ironic.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/compute/libvirt.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/compute/neutron.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/compute/rbd.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/compute/serial.pp
 file files/solaris_zones.pp \
-    path=etc/puppet/modules/nova/manifests/compute/solaris_zones.pp
-file path=etc/puppet/modules/nova/manifests/compute/spice.pp
-file path=etc/puppet/modules/nova/manifests/compute/vmware.pp
-file path=etc/puppet/modules/nova/manifests/compute/xenserver.pp
-file path=etc/puppet/modules/nova/manifests/conductor.pp
-file path=etc/puppet/modules/nova/manifests/config.pp
-file path=etc/puppet/modules/nova/manifests/consoleauth.pp
-file path=etc/puppet/modules/nova/manifests/cron/archive_deleted_rows.pp
-file path=etc/puppet/modules/nova/manifests/db.pp
-file path=etc/puppet/modules/nova/manifests/db/mysql.pp
-file path=etc/puppet/modules/nova/manifests/db/mysql_api.pp
-file path=etc/puppet/modules/nova/manifests/db/postgresql.pp
-file path=etc/puppet/modules/nova/manifests/db/postgresql_api.pp
-file path=etc/puppet/modules/nova/manifests/db/sync.pp
-file path=etc/puppet/modules/nova/manifests/db/sync_api.pp
-file path=etc/puppet/modules/nova/manifests/deps.pp
-file path=etc/puppet/modules/nova/manifests/generic_service.pp
-file path=etc/puppet/modules/nova/manifests/init.pp
-file path=etc/puppet/modules/nova/manifests/ironic/common.pp
-file path=etc/puppet/modules/nova/manifests/keystone/auth.pp
-file path=etc/puppet/modules/nova/manifests/logging.pp
-file path=etc/puppet/modules/nova/manifests/manage/cells.pp
-file path=etc/puppet/modules/nova/manifests/manage/floating.pp
-file path=etc/puppet/modules/nova/manifests/manage/network.pp
-file path=etc/puppet/modules/nova/manifests/migration/libvirt.pp
-file path=etc/puppet/modules/nova/manifests/network.pp
-file path=etc/puppet/modules/nova/manifests/network/bridge.pp
-file path=etc/puppet/modules/nova/manifests/network/flat.pp
-file path=etc/puppet/modules/nova/manifests/network/flatdhcp.pp
-file path=etc/puppet/modules/nova/manifests/network/neutron.pp
-file path=etc/puppet/modules/nova/manifests/network/vlan.pp
-file path=etc/puppet/modules/nova/manifests/objectstore.pp
-file path=etc/puppet/modules/nova/manifests/params.pp
-file path=etc/puppet/modules/nova/manifests/policy.pp
-file path=etc/puppet/modules/nova/manifests/qpid.pp
-file path=etc/puppet/modules/nova/manifests/quota.pp
-file path=etc/puppet/modules/nova/manifests/rabbitmq.pp
-file path=etc/puppet/modules/nova/manifests/scheduler.pp
-file path=etc/puppet/modules/nova/manifests/scheduler/filter.pp
-file path=etc/puppet/modules/nova/manifests/serialproxy.pp
-file path=etc/puppet/modules/nova/manifests/spicehtml5proxy.pp
-file path=etc/puppet/modules/nova/manifests/utilities.pp
-file path=etc/puppet/modules/nova/manifests/vncproxy.pp
-file path=etc/puppet/modules/nova/manifests/vncproxy/common.pp
-file path=etc/puppet/modules/nova/manifests/wsgi/apache.pp
-file path=etc/puppet/modules/nova/metadata.json
-file path=etc/puppet/modules/nova/releasenotes/notes/add_nova_api_db-62e459588e14a92e.yaml
-file path=etc/puppet/modules/nova/releasenotes/notes/deprecate_network_api_class-557e9ac007c97feb.yaml
-file path=etc/puppet/modules/nova/releasenotes/notes/keystone_v3_neutron-62f3f801039ddcc8.yaml
-file path=etc/puppet/modules/nova/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
-file path=etc/puppet/modules/nova/releasenotes/notes/mitaka_drepecations-704e9befd68c3c6d.yaml
-file path=etc/puppet/modules/nova/releasenotes/notes/mitaka_features-ddeb388524fa6590.yaml
-file path=etc/puppet/modules/nova/releasenotes/notes/nova_network_provider-10b28e14d9db08f0.yaml
-file path=etc/puppet/modules/nova/releasenotes/notes/pymysql-e57bf1f0289dd426.yaml
-file path=etc/puppet/modules/nova/releasenotes/notes/remove_qpid-0b446db43fdea617.yaml
-file path=etc/puppet/modules/nova/releasenotes/notes/security_group_provider-50c27926baa9e015.yaml
-file path=etc/puppet/modules/nova/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
-file path=etc/puppet/modules/nova/releasenotes/source/_static/.placeholder
-file path=etc/puppet/modules/nova/releasenotes/source/conf.py
-file path=etc/puppet/modules/nova/releasenotes/source/index.rst
-file path=etc/puppet/modules/nova/releasenotes/source/mitaka.rst
-file path=etc/puppet/modules/nova/releasenotes/source/unreleased.rst
-file path=etc/puppet/modules/nova/setup.cfg
-file path=etc/puppet/modules/nova/setup.py
-file path=etc/puppet/modules/nova/spec/acceptance/nodesets/centos-70-x64.yml
-file path=etc/puppet/modules/nova/spec/acceptance/nodesets/default.yml
-file path=etc/puppet/modules/nova/spec/acceptance/nodesets/nodepool-centos7.yml
-file path=etc/puppet/modules/nova/spec/acceptance/nodesets/nodepool-trusty.yml
-file path=etc/puppet/modules/nova/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
-file path=etc/puppet/modules/nova/spec/acceptance/nova_wsgi_apache_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_api_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_availability_zone_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_cells_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_cert_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_client_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_compute_ironic_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_compute_libvirt_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_compute_neutron_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_compute_rbd_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_compute_serial_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_compute_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_compute_spice_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_compute_vmware_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_compute_xenserver_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_conductor_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_config_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_consoleauth_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_cron_archive_deleted_rows_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_db_mysql_api_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_db_mysql_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_db_postgresql_api_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_db_postgresql_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_db_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_db_sync_api_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_db_sync_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_init_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_ironic_common_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_keystone_auth_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_logging_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_migration_libvirt_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_network_flat_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_network_flatdhcp_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_network_neutron_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_network_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_network_vlan_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_objectstore_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_policy_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_quota_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_rabbitmq_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_scheduler_filter_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_scheduler_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_serial_proxy_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_spicehtml5_proxy_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_utilities_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_vnc_proxy_spec.rb
-file path=etc/puppet/modules/nova/spec/classes/nova_wsgi_apache_spec.rb
-file path=etc/puppet/modules/nova/spec/defines/nova_generic_service_spec.rb
-file path=etc/puppet/modules/nova/spec/defines/nova_manage_networks_spec.rb
-file path=etc/puppet/modules/nova/spec/hosts/test-001_spec.rb
-file path=etc/puppet/modules/nova/spec/shared_examples.rb
-file path=etc/puppet/modules/nova/spec/spec_helper.rb
-file path=etc/puppet/modules/nova/spec/spec_helper_acceptance.rb
-file path=etc/puppet/modules/nova/spec/type/nova_aggregate_spec.rb
-file path=etc/puppet/modules/nova/spec/type/nova_security_group_spec.rb
-file path=etc/puppet/modules/nova/spec/type/nova_security_rule_spec.rb
-file path=etc/puppet/modules/nova/spec/unit/provider/nova_config/ini_setting_spec.rb
-file path=etc/puppet/modules/nova/spec/unit/provider/nova_floating/nova_manage_spec.rb
-file path=etc/puppet/modules/nova/spec/unit/provider/nova_network/nova_spec.rb
-file path=etc/puppet/modules/nova/spec/unit/provider/nova_security_group/nova_spec.rb
-file path=etc/puppet/modules/nova/spec/unit/provider/nova_security_rule/nova_spec.rb
-file path=etc/puppet/modules/nova/spec/unit/provider/nova_spec.rb
-file path=etc/puppet/modules/nova/spec/unit/type/nova_config_spec.rb
-file path=etc/puppet/modules/nova/spec/unit/type/nova_network_spec.rb
-file path=etc/puppet/modules/nova/spec/unit/type/nova_security_group_spec.rb
-file path=etc/puppet/modules/nova/spec/unit/type/nova_security_rule_spec.rb
-file path=etc/puppet/modules/nova/templates/secret.xml-compute.erb
-file path=etc/puppet/modules/nova/test-requirements.txt
-file path=etc/puppet/modules/nova/tox.ini
+    path=usr/puppetlabs/puppet/modules/nova/manifests/compute/solaris_zones.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/compute/spice.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/compute/vmware.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/compute/xenserver.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/conductor.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/config.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/consoleauth.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/cron/archive_deleted_rows.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/db.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/db/mysql.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/db/mysql_api.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/db/postgresql.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/db/postgresql_api.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/db/sync.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/db/sync_api.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/deps.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/generic_service.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/init.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/ironic/common.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/keystone/auth.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/logging.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/manage/cells.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/manage/floating.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/manage/network.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/migration/libvirt.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/network.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/network/bridge.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/network/flat.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/network/flatdhcp.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/network/neutron.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/network/vlan.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/objectstore.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/params.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/policy.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/qpid.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/quota.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/rabbitmq.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/scheduler.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/scheduler/filter.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/serialproxy.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/spicehtml5proxy.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/utilities.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/vncproxy.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/vncproxy/common.pp
+file path=usr/puppetlabs/puppet/modules/nova/manifests/wsgi/apache.pp
+file path=usr/puppetlabs/puppet/modules/nova/metadata.json
+file path=usr/puppetlabs/puppet/modules/nova/releasenotes/notes/add_nova_api_db-62e459588e14a92e.yaml
+file path=usr/puppetlabs/puppet/modules/nova/releasenotes/notes/deprecate_network_api_class-557e9ac007c97feb.yaml
+file path=usr/puppetlabs/puppet/modules/nova/releasenotes/notes/keystone_v3_neutron-62f3f801039ddcc8.yaml
+file path=usr/puppetlabs/puppet/modules/nova/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
+file path=usr/puppetlabs/puppet/modules/nova/releasenotes/notes/mitaka_drepecations-704e9befd68c3c6d.yaml
+file path=usr/puppetlabs/puppet/modules/nova/releasenotes/notes/mitaka_features-ddeb388524fa6590.yaml
+file path=usr/puppetlabs/puppet/modules/nova/releasenotes/notes/nova_network_provider-10b28e14d9db08f0.yaml
+file path=usr/puppetlabs/puppet/modules/nova/releasenotes/notes/pymysql-e57bf1f0289dd426.yaml
+file path=usr/puppetlabs/puppet/modules/nova/releasenotes/notes/remove_qpid-0b446db43fdea617.yaml
+file path=usr/puppetlabs/puppet/modules/nova/releasenotes/notes/security_group_provider-50c27926baa9e015.yaml
+file path=usr/puppetlabs/puppet/modules/nova/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
+file path=usr/puppetlabs/puppet/modules/nova/releasenotes/source/_static/.placeholder
+file path=usr/puppetlabs/puppet/modules/nova/releasenotes/source/conf.py
+file path=usr/puppetlabs/puppet/modules/nova/releasenotes/source/index.rst
+file path=usr/puppetlabs/puppet/modules/nova/releasenotes/source/mitaka.rst
+file path=usr/puppetlabs/puppet/modules/nova/releasenotes/source/unreleased.rst
+file path=usr/puppetlabs/puppet/modules/nova/setup.cfg
+file path=usr/puppetlabs/puppet/modules/nova/setup.py
+file path=usr/puppetlabs/puppet/modules/nova/spec/acceptance/nodesets/centos-70-x64.yml
+file path=usr/puppetlabs/puppet/modules/nova/spec/acceptance/nodesets/default.yml
+file path=usr/puppetlabs/puppet/modules/nova/spec/acceptance/nodesets/nodepool-centos7.yml
+file path=usr/puppetlabs/puppet/modules/nova/spec/acceptance/nodesets/nodepool-trusty.yml
+file path=usr/puppetlabs/puppet/modules/nova/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+file path=usr/puppetlabs/puppet/modules/nova/spec/acceptance/nova_wsgi_apache_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_api_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_availability_zone_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_cells_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_cert_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_client_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_compute_ironic_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_compute_libvirt_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_compute_neutron_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_compute_rbd_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_compute_serial_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_compute_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_compute_spice_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_compute_vmware_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_compute_xenserver_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_conductor_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_consoleauth_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_cron_archive_deleted_rows_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_db_mysql_api_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_db_mysql_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_db_postgresql_api_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_db_postgresql_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_db_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_db_sync_api_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_db_sync_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_init_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_ironic_common_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_keystone_auth_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_logging_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_migration_libvirt_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_network_flat_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_network_flatdhcp_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_network_neutron_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_network_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_network_vlan_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_objectstore_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_policy_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_quota_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_rabbitmq_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_scheduler_filter_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_scheduler_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_serial_proxy_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_spicehtml5_proxy_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_utilities_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_vnc_proxy_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/classes/nova_wsgi_apache_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/defines/nova_generic_service_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/defines/nova_manage_networks_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/hosts/test-001_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/shared_examples.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/spec_helper.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/spec_helper_acceptance.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/type/nova_aggregate_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/type/nova_security_group_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/type/nova_security_rule_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/unit/provider/nova_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/unit/provider/nova_floating/nova_manage_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/unit/provider/nova_network/nova_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/unit/provider/nova_security_group/nova_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/unit/provider/nova_security_rule/nova_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/unit/provider/nova_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/unit/type/nova_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/unit/type/nova_network_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/unit/type/nova_security_group_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/spec/unit/type/nova_security_rule_spec.rb
+file path=usr/puppetlabs/puppet/modules/nova/templates/secret.xml-compute.erb
+file path=usr/puppetlabs/puppet/modules/nova/test-requirements.txt
+file path=usr/puppetlabs/puppet/modules/nova/tox.ini
 #
 license openstack-nova.license license="Apache v2.0"
 
--- a/components/ruby/puppet-modules/openstack-openstacklib/openstack-openstacklib.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet-modules/openstack-openstacklib/openstack-openstacklib.p5m	Mon Nov 28 16:54:02 2016 -0800
@@ -34,87 +34,87 @@
     value="org.opensolaris.category.2008:System/Administration and Configuration"
 set name=info.upstream value="OpenStack <[email protected]>"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2016/001
+set name=org.opensolaris.arc-caseid value=PSARC/2016/001 value=PSARC/2016/607
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file path=etc/puppet/modules/openstacklib/CHANGELOG.md
-file path=etc/puppet/modules/openstacklib/Gemfile
-file path=etc/puppet/modules/openstacklib/LICENSE
-file path=etc/puppet/modules/openstacklib/README.md
-file path=etc/puppet/modules/openstacklib/Rakefile
-file path=etc/puppet/modules/openstacklib/checksums.json
-file path=etc/puppet/modules/openstacklib/facts.d/os_service_default.txt
-file path=etc/puppet/modules/openstacklib/lib/facter/os_package_type.rb
-file path=etc/puppet/modules/openstacklib/lib/facter/os_service_default.rb
-file path=etc/puppet/modules/openstacklib/lib/puppet/parser/functions/is_service_default.rb
-file path=etc/puppet/modules/openstacklib/lib/puppet/parser/functions/normalize_ip_for_uri.rb
-file path=etc/puppet/modules/openstacklib/lib/puppet/parser/functions/os_database_connection.rb
-file path=etc/puppet/modules/openstacklib/lib/puppet/provider/openstack.rb
-file path=etc/puppet/modules/openstacklib/lib/puppet/provider/openstack/auth.rb
-file path=etc/puppet/modules/openstacklib/lib/puppet/provider/openstack/credentials.rb
-file path=etc/puppet/modules/openstacklib/lib/puppet/provider/openstack_config/ini_setting.rb
-file path=etc/puppet/modules/openstacklib/lib/puppet/provider/openstack_config/ruby.rb
-file path=etc/puppet/modules/openstacklib/lib/puppet/type/openstack_config.rb
-file path=etc/puppet/modules/openstacklib/lib/puppet/util/openstackconfig.rb
-file path=etc/puppet/modules/openstacklib/lib/puppet/util/openstackconfig/section.rb
-file path=etc/puppet/modules/openstacklib/manifests/db/mysql.pp
-file path=etc/puppet/modules/openstacklib/manifests/db/mysql/host_access.pp
-file path=etc/puppet/modules/openstacklib/manifests/db/postgresql.pp
-file path=etc/puppet/modules/openstacklib/manifests/messaging/rabbitmq.pp
-file path=etc/puppet/modules/openstacklib/manifests/openstackclient.pp
-file path=etc/puppet/modules/openstacklib/manifests/policy.pp
-file path=etc/puppet/modules/openstacklib/manifests/policy/base.pp
-file path=etc/puppet/modules/openstacklib/manifests/policyrcd.pp
-file path=etc/puppet/modules/openstacklib/manifests/service_validation.pp
-file path=etc/puppet/modules/openstacklib/manifests/wsgi/apache.pp
-file path=etc/puppet/modules/openstacklib/metadata.json
-file path=etc/puppet/modules/openstacklib/releasenotes/notes/catch_403-237b79f33ab3364f.yaml
-file path=etc/puppet/modules/openstacklib/releasenotes/notes/feature_add_exclusion_to_retry_mechanism-2acb52fa25bd315c.yaml
-file path=etc/puppet/modules/openstacklib/releasenotes/notes/ipv6_brackets-7a453aea5e091855.yaml
-file path=etc/puppet/modules/openstacklib/releasenotes/notes/manage_policy_rc_d_file-747510db06792d52.yaml
-file path=etc/puppet/modules/openstacklib/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
-file path=etc/puppet/modules/openstacklib/releasenotes/notes/more_db_options-d96316ae4eb5a78c.yaml
-file path=etc/puppet/modules/openstacklib/releasenotes/notes/retry_client-b8a0e1f9ff679281.yaml
-file path=etc/puppet/modules/openstacklib/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
-file path=etc/puppet/modules/openstacklib/releasenotes/source/_static/.placeholder
-file path=etc/puppet/modules/openstacklib/releasenotes/source/conf.py
-file path=etc/puppet/modules/openstacklib/releasenotes/source/index.rst
-file path=etc/puppet/modules/openstacklib/releasenotes/source/mitaka.rst
-file path=etc/puppet/modules/openstacklib/releasenotes/source/unreleased.rst
-file path=etc/puppet/modules/openstacklib/setup.cfg
-file path=etc/puppet/modules/openstacklib/setup.py
-file path=etc/puppet/modules/openstacklib/spec/acceptance/mysql_spec.rb
-file path=etc/puppet/modules/openstacklib/spec/acceptance/nodesets/centos-70-x64.yml
-file path=etc/puppet/modules/openstacklib/spec/acceptance/nodesets/default.yml
-file path=etc/puppet/modules/openstacklib/spec/acceptance/nodesets/nodepool-centos7.yml
-file path=etc/puppet/modules/openstacklib/spec/acceptance/nodesets/nodepool-trusty.yml
-file path=etc/puppet/modules/openstacklib/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
-file path=etc/puppet/modules/openstacklib/spec/acceptance/openstacklib_config_provider_spec.rb
-file path=etc/puppet/modules/openstacklib/spec/acceptance/rabbitmq_spec.rb
-file path=etc/puppet/modules/openstacklib/spec/classes/init_spec.rb
-file path=etc/puppet/modules/openstacklib/spec/classes/openstacklib_policy_spec.rb
-file path=etc/puppet/modules/openstacklib/spec/classes/openstacklib_policyrcd_spec.rb
-file path=etc/puppet/modules/openstacklib/spec/defines/openstacklib_db_mysql_host_access_spec.rb
-file path=etc/puppet/modules/openstacklib/spec/defines/openstacklib_db_mysql_spec.rb
-file path=etc/puppet/modules/openstacklib/spec/defines/openstacklib_db_postgresql_spec.rb
-file path=etc/puppet/modules/openstacklib/spec/defines/openstacklib_messaging_rabbitmq_spec.rb
-file path=etc/puppet/modules/openstacklib/spec/defines/openstacklib_policy_spec.rb
-file path=etc/puppet/modules/openstacklib/spec/defines/openstacklib_service_validation_spec.rb
-file path=etc/puppet/modules/openstacklib/spec/defines/openstacklib_wsgi_apache_spec.rb
-file path=etc/puppet/modules/openstacklib/spec/functions/is_service_default_spec.rb
-file path=etc/puppet/modules/openstacklib/spec/functions/normalize_ip_for_uri_spec.rb
-file path=etc/puppet/modules/openstacklib/spec/functions/os_database_connection_spec.rb
-file path=etc/puppet/modules/openstacklib/spec/shared_examples.rb
-file path=etc/puppet/modules/openstacklib/spec/spec_helper.rb
-file path=etc/puppet/modules/openstacklib/spec/spec_helper_acceptance.rb
-file path=etc/puppet/modules/openstacklib/spec/unit/provider/openstack/auth_spec.rb
-file path=etc/puppet/modules/openstacklib/spec/unit/provider/openstack/credentials_spec.rb
-file path=etc/puppet/modules/openstacklib/spec/unit/provider/openstack_config/ini_setting_spec.rb
-file path=etc/puppet/modules/openstacklib/spec/unit/provider/openstack_spec.rb
-file path=etc/puppet/modules/openstacklib/spec/unit/puppet/util/openstackconfig_spec.rb
-file path=etc/puppet/modules/openstacklib/templates/policy-rc.d.erb
-file path=etc/puppet/modules/openstacklib/test-requirements.txt
-file path=etc/puppet/modules/openstacklib/tox.ini
+file path=usr/puppetlabs/puppet/modules/openstacklib/CHANGELOG.md
+file path=usr/puppetlabs/puppet/modules/openstacklib/Gemfile
+file path=usr/puppetlabs/puppet/modules/openstacklib/LICENSE
+file path=usr/puppetlabs/puppet/modules/openstacklib/README.md
+file path=usr/puppetlabs/puppet/modules/openstacklib/Rakefile
+file path=usr/puppetlabs/puppet/modules/openstacklib/checksums.json
+file path=usr/puppetlabs/puppet/modules/openstacklib/facts.d/os_service_default.txt
+file path=usr/puppetlabs/puppet/modules/openstacklib/lib/facter/os_package_type.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/lib/facter/os_service_default.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/lib/puppet/parser/functions/is_service_default.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/lib/puppet/parser/functions/normalize_ip_for_uri.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/lib/puppet/parser/functions/os_database_connection.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/lib/puppet/provider/openstack.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/lib/puppet/provider/openstack/auth.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/lib/puppet/provider/openstack/credentials.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/lib/puppet/provider/openstack_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/lib/puppet/provider/openstack_config/ruby.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/lib/puppet/type/openstack_config.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/lib/puppet/util/openstackconfig.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/lib/puppet/util/openstackconfig/section.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/manifests/db/mysql.pp
+file path=usr/puppetlabs/puppet/modules/openstacklib/manifests/db/mysql/host_access.pp
+file path=usr/puppetlabs/puppet/modules/openstacklib/manifests/db/postgresql.pp
+file path=usr/puppetlabs/puppet/modules/openstacklib/manifests/messaging/rabbitmq.pp
+file path=usr/puppetlabs/puppet/modules/openstacklib/manifests/openstackclient.pp
+file path=usr/puppetlabs/puppet/modules/openstacklib/manifests/policy.pp
+file path=usr/puppetlabs/puppet/modules/openstacklib/manifests/policy/base.pp
+file path=usr/puppetlabs/puppet/modules/openstacklib/manifests/policyrcd.pp
+file path=usr/puppetlabs/puppet/modules/openstacklib/manifests/service_validation.pp
+file path=usr/puppetlabs/puppet/modules/openstacklib/manifests/wsgi/apache.pp
+file path=usr/puppetlabs/puppet/modules/openstacklib/metadata.json
+file path=usr/puppetlabs/puppet/modules/openstacklib/releasenotes/notes/catch_403-237b79f33ab3364f.yaml
+file path=usr/puppetlabs/puppet/modules/openstacklib/releasenotes/notes/feature_add_exclusion_to_retry_mechanism-2acb52fa25bd315c.yaml
+file path=usr/puppetlabs/puppet/modules/openstacklib/releasenotes/notes/ipv6_brackets-7a453aea5e091855.yaml
+file path=usr/puppetlabs/puppet/modules/openstacklib/releasenotes/notes/manage_policy_rc_d_file-747510db06792d52.yaml
+file path=usr/puppetlabs/puppet/modules/openstacklib/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
+file path=usr/puppetlabs/puppet/modules/openstacklib/releasenotes/notes/more_db_options-d96316ae4eb5a78c.yaml
+file path=usr/puppetlabs/puppet/modules/openstacklib/releasenotes/notes/retry_client-b8a0e1f9ff679281.yaml
+file path=usr/puppetlabs/puppet/modules/openstacklib/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
+file path=usr/puppetlabs/puppet/modules/openstacklib/releasenotes/source/_static/.placeholder
+file path=usr/puppetlabs/puppet/modules/openstacklib/releasenotes/source/conf.py
+file path=usr/puppetlabs/puppet/modules/openstacklib/releasenotes/source/index.rst
+file path=usr/puppetlabs/puppet/modules/openstacklib/releasenotes/source/mitaka.rst
+file path=usr/puppetlabs/puppet/modules/openstacklib/releasenotes/source/unreleased.rst
+file path=usr/puppetlabs/puppet/modules/openstacklib/setup.cfg
+file path=usr/puppetlabs/puppet/modules/openstacklib/setup.py
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/acceptance/mysql_spec.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/acceptance/nodesets/centos-70-x64.yml
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/acceptance/nodesets/default.yml
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/acceptance/nodesets/nodepool-centos7.yml
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/acceptance/nodesets/nodepool-trusty.yml
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/acceptance/openstacklib_config_provider_spec.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/acceptance/rabbitmq_spec.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/classes/init_spec.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/classes/openstacklib_policy_spec.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/classes/openstacklib_policyrcd_spec.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/defines/openstacklib_db_mysql_host_access_spec.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/defines/openstacklib_db_mysql_spec.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/defines/openstacklib_db_postgresql_spec.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/defines/openstacklib_messaging_rabbitmq_spec.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/defines/openstacklib_policy_spec.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/defines/openstacklib_service_validation_spec.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/defines/openstacklib_wsgi_apache_spec.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/functions/is_service_default_spec.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/functions/normalize_ip_for_uri_spec.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/functions/os_database_connection_spec.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/shared_examples.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/spec_helper.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/spec_helper_acceptance.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/unit/provider/openstack/auth_spec.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/unit/provider/openstack/credentials_spec.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/unit/provider/openstack_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/unit/provider/openstack_spec.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/spec/unit/puppet/util/openstackconfig_spec.rb
+file path=usr/puppetlabs/puppet/modules/openstacklib/templates/policy-rc.d.erb
+file path=usr/puppetlabs/puppet/modules/openstacklib/test-requirements.txt
+file path=usr/puppetlabs/puppet/modules/openstacklib/tox.ini
 #
 license openstack-openstacklib.license license="Apache v2.0"
 
--- a/components/ruby/puppet-modules/openstack-swift/openstack-swift.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet-modules/openstack-swift/openstack-swift.p5m	Mon Nov 28 16:54:02 2016 -0800
@@ -35,233 +35,233 @@
     value="org.opensolaris.category.2008:System/Enterprise Management"
 set name=info.upstream value="OpenStack <[email protected]>"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2016/001
+set name=org.opensolaris.arc-caseid value=PSARC/2016/001 value=PSARC/2016/607
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file path=etc/puppet/modules/swift/CHANGELOG.md
-file path=etc/puppet/modules/swift/Gemfile
-file path=etc/puppet/modules/swift/LICENSE
-file path=etc/puppet/modules/swift/README.md
-file path=etc/puppet/modules/swift/Rakefile
-file path=etc/puppet/modules/swift/checksums.json
-file path=etc/puppet/modules/swift/ext/swift.rb
-file path=etc/puppet/modules/swift/ext/swift_keystone_test.rb
-file path=etc/puppet/modules/swift/files/swift_tester.rb
-file path=etc/puppet/modules/swift/lib/puppet/provider/ring_account_device/swift_ring_builder.rb
-file path=etc/puppet/modules/swift/lib/puppet/provider/ring_container_device/swift_ring_builder.rb
-file path=etc/puppet/modules/swift/lib/puppet/provider/ring_object_device/swift_ring_builder.rb
-file path=etc/puppet/modules/swift/lib/puppet/provider/service/swiftinit.rb
-file path=etc/puppet/modules/swift/lib/puppet/provider/swift_account_config/ini_setting.rb
-file path=etc/puppet/modules/swift/lib/puppet/provider/swift_bench_config/ini_setting.rb
-file path=etc/puppet/modules/swift/lib/puppet/provider/swift_config/ini_setting.rb
-file path=etc/puppet/modules/swift/lib/puppet/provider/swift_container_config/ini_setting.rb
-file path=etc/puppet/modules/swift/lib/puppet/provider/swift_container_sync_realms_config/ini_setting.rb
-file path=etc/puppet/modules/swift/lib/puppet/provider/swift_dispersion_config/ini_setting.rb
-file path=etc/puppet/modules/swift/lib/puppet/provider/swift_object_config/ini_setting.rb
-file path=etc/puppet/modules/swift/lib/puppet/provider/swift_object_expirer_config/ini_setting.rb
-file path=etc/puppet/modules/swift/lib/puppet/provider/swift_proxy_config/ini_setting.rb
-file path=etc/puppet/modules/swift/lib/puppet/provider/swift_ring_builder.rb
-file path=etc/puppet/modules/swift/lib/puppet/type/ring_account_device.rb
-file path=etc/puppet/modules/swift/lib/puppet/type/ring_container_device.rb
-file path=etc/puppet/modules/swift/lib/puppet/type/ring_object_device.rb
-file path=etc/puppet/modules/swift/lib/puppet/type/swift_account_config.rb
-file path=etc/puppet/modules/swift/lib/puppet/type/swift_bench_config.rb
-file path=etc/puppet/modules/swift/lib/puppet/type/swift_config.rb
-file path=etc/puppet/modules/swift/lib/puppet/type/swift_container_config.rb
-file path=etc/puppet/modules/swift/lib/puppet/type/swift_container_sync_realms_config.rb
-file path=etc/puppet/modules/swift/lib/puppet/type/swift_dispersion_config.rb
-file path=etc/puppet/modules/swift/lib/puppet/type/swift_object_config.rb
-file path=etc/puppet/modules/swift/lib/puppet/type/swift_object_expirer_config.rb
-file path=etc/puppet/modules/swift/lib/puppet/type/swift_proxy_config.rb
-file path=etc/puppet/modules/swift/manifests/auth_file.pp
-file path=etc/puppet/modules/swift/manifests/bench.pp
-file path=etc/puppet/modules/swift/manifests/client.pp
-file path=etc/puppet/modules/swift/manifests/config.pp
-file path=etc/puppet/modules/swift/manifests/dispersion.pp
-file path=etc/puppet/modules/swift/manifests/init.pp
-file path=etc/puppet/modules/swift/manifests/keystone/auth.pp
-file path=etc/puppet/modules/swift/manifests/keystone/dispersion.pp
-file path=etc/puppet/modules/swift/manifests/objectexpirer.pp
-file path=etc/puppet/modules/swift/manifests/params.pp
-file path=etc/puppet/modules/swift/manifests/proxy.pp
-file path=etc/puppet/modules/swift/manifests/proxy/account_quotas.pp
-file path=etc/puppet/modules/swift/manifests/proxy/authtoken.pp
-file path=etc/puppet/modules/swift/manifests/proxy/bulk.pp
-file path=etc/puppet/modules/swift/manifests/proxy/cache.pp
-file path=etc/puppet/modules/swift/manifests/proxy/catch_errors.pp
-file path=etc/puppet/modules/swift/manifests/proxy/ceilometer.pp
-file path=etc/puppet/modules/swift/manifests/proxy/container_quotas.pp
-file path=etc/puppet/modules/swift/manifests/proxy/container_sync.pp
-file path=etc/puppet/modules/swift/manifests/proxy/crossdomain.pp
-file path=etc/puppet/modules/swift/manifests/proxy/dlo.pp
-file path=etc/puppet/modules/swift/manifests/proxy/formpost.pp
-file path=etc/puppet/modules/swift/manifests/proxy/gatekeeper.pp
-file path=etc/puppet/modules/swift/manifests/proxy/healthcheck.pp
-file path=etc/puppet/modules/swift/manifests/proxy/keystone.pp
-file path=etc/puppet/modules/swift/manifests/proxy/proxy_logging.pp
-file path=etc/puppet/modules/swift/manifests/proxy/ratelimit.pp
-file path=etc/puppet/modules/swift/manifests/proxy/s3token.pp
-file path=etc/puppet/modules/swift/manifests/proxy/slo.pp
-file path=etc/puppet/modules/swift/manifests/proxy/staticweb.pp
-file path=etc/puppet/modules/swift/manifests/proxy/swauth.pp
-file path=etc/puppet/modules/swift/manifests/proxy/swift3.pp
-file path=etc/puppet/modules/swift/manifests/proxy/tempauth.pp
-file path=etc/puppet/modules/swift/manifests/proxy/tempurl.pp
-file path=etc/puppet/modules/swift/manifests/ringbuilder.pp
-file path=etc/puppet/modules/swift/manifests/ringbuilder/create.pp
-file path=etc/puppet/modules/swift/manifests/ringbuilder/rebalance.pp
-file path=etc/puppet/modules/swift/manifests/ringserver.pp
-file path=etc/puppet/modules/swift/manifests/ringsync.pp
-file path=etc/puppet/modules/swift/manifests/service.pp
-file path=etc/puppet/modules/swift/manifests/storage.pp
-file path=etc/puppet/modules/swift/manifests/storage/account.pp
-file path=etc/puppet/modules/swift/manifests/storage/all.pp
-file path=etc/puppet/modules/swift/manifests/storage/container.pp
-file path=etc/puppet/modules/swift/manifests/storage/disk.pp
-file path=etc/puppet/modules/swift/manifests/storage/ext4.pp
-file path=etc/puppet/modules/swift/manifests/storage/filter/healthcheck.pp
-file path=etc/puppet/modules/swift/manifests/storage/filter/recon.pp
-file path=etc/puppet/modules/swift/manifests/storage/generic.pp
-file path=etc/puppet/modules/swift/manifests/storage/loopback.pp
-file path=etc/puppet/modules/swift/manifests/storage/mount.pp
-file path=etc/puppet/modules/swift/manifests/storage/node.pp
-file path=etc/puppet/modules/swift/manifests/storage/object.pp
-file path=etc/puppet/modules/swift/manifests/storage/server.pp
-file path=etc/puppet/modules/swift/manifests/storage/xfs.pp
-file path=etc/puppet/modules/swift/manifests/test_file.pp
-file path=etc/puppet/modules/swift/manifests/xfs.pp
-file path=etc/puppet/modules/swift/metadata.json
-file path=etc/puppet/modules/swift/releasenotes/notes/container_sync-5869bca433355047.yaml
-file path=etc/puppet/modules/swift/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
-file path=etc/puppet/modules/swift/releasenotes/notes/mitaka_deprecation-3344541c884cfed8.yaml
-file path=etc/puppet/modules/swift/releasenotes/notes/mitaka_features-52ecf51429531fbb.yaml
-file path=etc/puppet/modules/swift/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
-file path=etc/puppet/modules/swift/releasenotes/source/_static/.placeholder
-file path=etc/puppet/modules/swift/releasenotes/source/conf.py
-file path=etc/puppet/modules/swift/releasenotes/source/index.rst
-file path=etc/puppet/modules/swift/releasenotes/source/mitaka.rst
-file path=etc/puppet/modules/swift/releasenotes/source/unreleased.rst
-file path=etc/puppet/modules/swift/setup.cfg
-file path=etc/puppet/modules/swift/setup.py
-file path=etc/puppet/modules/swift/spec/acceptance/basic_swift_spec.rb
-file path=etc/puppet/modules/swift/spec/acceptance/nodesets/centos-70-x64.yml
-file path=etc/puppet/modules/swift/spec/acceptance/nodesets/default.yml
-file path=etc/puppet/modules/swift/spec/acceptance/nodesets/nodepool-centos7.yml
-file path=etc/puppet/modules/swift/spec/acceptance/nodesets/nodepool-trusty.yml
-file path=etc/puppet/modules/swift/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
-file path=etc/puppet/modules/swift/spec/acceptance/swift_config_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_bench_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_client_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_config_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_dispersion_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_keystone_auth_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_keystone_dispersion_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_objectexpirer_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_proxy_account_quotas_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_proxy_authtoken_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_proxy_bulk_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_proxy_cache_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_proxy_catch_errors_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_proxy_ceilometer_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_proxy_container_quotas_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_proxy_container_sync_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_proxy_crossdomain_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_proxy_dlo_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_proxy_formpost_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_proxy_gatekeeper_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_proxy_healthcheck_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_proxy_keystone_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_proxy_ratelimit_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_proxy_s3token_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_proxy_slo_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_proxy_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_proxy_staticweb_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_proxy_swauth_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_proxy_swift3_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_proxy_tempauth_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_proxy_tempurl_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_ringbuilder_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_ringserver_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_storage_account_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_storage_all_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_storage_container_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_storage_object_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_storage_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_test_file_spec.rb
-file path=etc/puppet/modules/swift/spec/classes/swift_xfs_spec.rb
-file path=etc/puppet/modules/swift/spec/defines/swift_ringbuilder_create_spec.rb
-file path=etc/puppet/modules/swift/spec/defines/swift_ringbuilder_rebalance_spec.rb
-file path=etc/puppet/modules/swift/spec/defines/swift_storage_disk_spec.rb
-file path=etc/puppet/modules/swift/spec/defines/swift_storage_filter_healthcheck_spec.rb
-file path=etc/puppet/modules/swift/spec/defines/swift_storage_filter_recon_spec.rb
-file path=etc/puppet/modules/swift/spec/defines/swift_storage_generic_spec.rb
-file path=etc/puppet/modules/swift/spec/defines/swift_storage_loopback_spec.rb
-file path=etc/puppet/modules/swift/spec/defines/swift_storage_mount_spec.rb
-file path=etc/puppet/modules/swift/spec/defines/swift_storage_node_spec.rb
-file path=etc/puppet/modules/swift/spec/defines/swift_storage_server_spec.rb
-file path=etc/puppet/modules/swift/spec/defines/swift_storage_xfs_spec.rb
-file path=etc/puppet/modules/swift/spec/shared_examples.rb
-file path=etc/puppet/modules/swift/spec/spec.opts
-file path=etc/puppet/modules/swift/spec/spec_helper.rb
-file path=etc/puppet/modules/swift/spec/spec_helper_acceptance.rb
-file path=etc/puppet/modules/swift/spec/unit/provider/swift_account_config/ini_setting_spec.rb
-file path=etc/puppet/modules/swift/spec/unit/provider/swift_bench_config/ini_setting_spec.rb
-file path=etc/puppet/modules/swift/spec/unit/provider/swift_config/ini_setting_spec.rb
-file path=etc/puppet/modules/swift/spec/unit/provider/swift_container_config/ini_setting_spec.rb
-file path=etc/puppet/modules/swift/spec/unit/provider/swift_container_sync_realms_config/ini_setting_spec.rb
-file path=etc/puppet/modules/swift/spec/unit/provider/swift_dispersion_config/ini_setting_spec.rb
-file path=etc/puppet/modules/swift/spec/unit/provider/swift_object_config/ini_setting_spec.rb
-file path=etc/puppet/modules/swift/spec/unit/provider/swift_object_expirer_config/ini_setting_spec.rb
-file path=etc/puppet/modules/swift/spec/unit/provider/swift_proxy_config/ini_setting_spec.rb
-file path=etc/puppet/modules/swift/spec/unit/puppet/provider/service/swiftinit_spec.rb
-file path=etc/puppet/modules/swift/spec/unit/puppet/provider/swift_ring_builder_spec.rb
-file path=etc/puppet/modules/swift/spec/unit/puppet/type/ring_account_device_spec.rb
-file path=etc/puppet/modules/swift/spec/unit/puppet/type/ring_container_device_spec.rb
-file path=etc/puppet/modules/swift/spec/unit/puppet/type/ring_object_device_spec.rb
-file path=etc/puppet/modules/swift/spec/unit/type/swift_account_config_spec.rb
-file path=etc/puppet/modules/swift/spec/unit/type/swift_bench_config_spec.rb
-file path=etc/puppet/modules/swift/spec/unit/type/swift_config_spec.rb
-file path=etc/puppet/modules/swift/spec/unit/type/swift_container_config_spec.rb
-file path=etc/puppet/modules/swift/spec/unit/type/swift_container_sync_realms_config.rb
-file path=etc/puppet/modules/swift/spec/unit/type/swift_dispersion_config_spec.rb
-file path=etc/puppet/modules/swift/spec/unit/type/swift_object_config_spec.rb
-file path=etc/puppet/modules/swift/spec/unit/type/swift_object_expirer_config_spec.rb
-file path=etc/puppet/modules/swift/spec/unit/type/swift_proxy_config_spec.rb
-file path=etc/puppet/modules/swift/templates/account-server.conf.erb
-file path=etc/puppet/modules/swift/templates/container-server.conf.erb
-file path=etc/puppet/modules/swift/templates/object-server.conf.erb
-file path=etc/puppet/modules/swift/templates/proxy-server.conf.erb
-file path=etc/puppet/modules/swift/templates/proxy/account_quotas.conf.erb
-file path=etc/puppet/modules/swift/templates/proxy/authtoken.conf.erb
-file path=etc/puppet/modules/swift/templates/proxy/bulk.conf.erb
-file path=etc/puppet/modules/swift/templates/proxy/cache.conf.erb
-file path=etc/puppet/modules/swift/templates/proxy/catch_errors.conf.erb
-file path=etc/puppet/modules/swift/templates/proxy/ceilometer.conf.erb
-file path=etc/puppet/modules/swift/templates/proxy/container_quotas.conf.erb
-file path=etc/puppet/modules/swift/templates/proxy/container_sync.conf.erb
-file path=etc/puppet/modules/swift/templates/proxy/crossdomain.conf.erb
-file path=etc/puppet/modules/swift/templates/proxy/dlo.conf.erb
-file path=etc/puppet/modules/swift/templates/proxy/formpost.conf.erb
-file path=etc/puppet/modules/swift/templates/proxy/gatekeeper.conf.erb
-file path=etc/puppet/modules/swift/templates/proxy/healthcheck.conf.erb
-file path=etc/puppet/modules/swift/templates/proxy/keystone.conf.erb
-file path=etc/puppet/modules/swift/templates/proxy/proxy-logging.conf.erb
-file path=etc/puppet/modules/swift/templates/proxy/ratelimit.conf.erb
-file path=etc/puppet/modules/swift/templates/proxy/s3token.conf.erb
-file path=etc/puppet/modules/swift/templates/proxy/slo.conf.erb
-file path=etc/puppet/modules/swift/templates/proxy/staticweb.conf.erb
-file path=etc/puppet/modules/swift/templates/proxy/swauth.conf.erb
-file path=etc/puppet/modules/swift/templates/proxy/swift3.conf.erb
-file path=etc/puppet/modules/swift/templates/proxy/tempauth.conf.erb
-file path=etc/puppet/modules/swift/templates/proxy/tempurl.conf.erb
-file path=etc/puppet/modules/swift/templates/recon.conf.erb
-file path=etc/puppet/modules/swift/templates/rsyncd.conf.erb
-file path=etc/puppet/modules/swift/templates/swift_keystone_test.erb
-file path=etc/puppet/modules/swift/test-requirements.txt
-file path=etc/puppet/modules/swift/tests/all.pp
-file path=etc/puppet/modules/swift/tests/site.pp
-file path=etc/puppet/modules/swift/tox.ini
+file path=usr/puppetlabs/puppet/modules/swift/CHANGELOG.md
+file path=usr/puppetlabs/puppet/modules/swift/Gemfile
+file path=usr/puppetlabs/puppet/modules/swift/LICENSE
+file path=usr/puppetlabs/puppet/modules/swift/README.md
+file path=usr/puppetlabs/puppet/modules/swift/Rakefile
+file path=usr/puppetlabs/puppet/modules/swift/checksums.json
+file path=usr/puppetlabs/puppet/modules/swift/ext/swift.rb
+file path=usr/puppetlabs/puppet/modules/swift/ext/swift_keystone_test.rb
+file path=usr/puppetlabs/puppet/modules/swift/files/swift_tester.rb
+file path=usr/puppetlabs/puppet/modules/swift/lib/puppet/provider/ring_account_device/swift_ring_builder.rb
+file path=usr/puppetlabs/puppet/modules/swift/lib/puppet/provider/ring_container_device/swift_ring_builder.rb
+file path=usr/puppetlabs/puppet/modules/swift/lib/puppet/provider/ring_object_device/swift_ring_builder.rb
+file path=usr/puppetlabs/puppet/modules/swift/lib/puppet/provider/service/swiftinit.rb
+file path=usr/puppetlabs/puppet/modules/swift/lib/puppet/provider/swift_account_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/swift/lib/puppet/provider/swift_bench_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/swift/lib/puppet/provider/swift_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/swift/lib/puppet/provider/swift_container_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/swift/lib/puppet/provider/swift_container_sync_realms_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/swift/lib/puppet/provider/swift_dispersion_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/swift/lib/puppet/provider/swift_object_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/swift/lib/puppet/provider/swift_object_expirer_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/swift/lib/puppet/provider/swift_proxy_config/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/swift/lib/puppet/provider/swift_ring_builder.rb
+file path=usr/puppetlabs/puppet/modules/swift/lib/puppet/type/ring_account_device.rb
+file path=usr/puppetlabs/puppet/modules/swift/lib/puppet/type/ring_container_device.rb
+file path=usr/puppetlabs/puppet/modules/swift/lib/puppet/type/ring_object_device.rb
+file path=usr/puppetlabs/puppet/modules/swift/lib/puppet/type/swift_account_config.rb
+file path=usr/puppetlabs/puppet/modules/swift/lib/puppet/type/swift_bench_config.rb
+file path=usr/puppetlabs/puppet/modules/swift/lib/puppet/type/swift_config.rb
+file path=usr/puppetlabs/puppet/modules/swift/lib/puppet/type/swift_container_config.rb
+file path=usr/puppetlabs/puppet/modules/swift/lib/puppet/type/swift_container_sync_realms_config.rb
+file path=usr/puppetlabs/puppet/modules/swift/lib/puppet/type/swift_dispersion_config.rb
+file path=usr/puppetlabs/puppet/modules/swift/lib/puppet/type/swift_object_config.rb
+file path=usr/puppetlabs/puppet/modules/swift/lib/puppet/type/swift_object_expirer_config.rb
+file path=usr/puppetlabs/puppet/modules/swift/lib/puppet/type/swift_proxy_config.rb
+file path=usr/puppetlabs/puppet/modules/swift/manifests/auth_file.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/bench.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/client.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/config.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/dispersion.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/init.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/keystone/auth.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/keystone/dispersion.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/objectexpirer.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/params.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/proxy.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/proxy/account_quotas.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/proxy/authtoken.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/proxy/bulk.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/proxy/cache.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/proxy/catch_errors.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/proxy/ceilometer.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/proxy/container_quotas.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/proxy/container_sync.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/proxy/crossdomain.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/proxy/dlo.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/proxy/formpost.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/proxy/gatekeeper.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/proxy/healthcheck.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/proxy/keystone.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/proxy/proxy_logging.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/proxy/ratelimit.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/proxy/s3token.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/proxy/slo.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/proxy/staticweb.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/proxy/swauth.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/proxy/swift3.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/proxy/tempauth.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/proxy/tempurl.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/ringbuilder.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/ringbuilder/create.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/ringbuilder/rebalance.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/ringserver.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/ringsync.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/service.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/storage.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/storage/account.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/storage/all.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/storage/container.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/storage/disk.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/storage/ext4.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/storage/filter/healthcheck.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/storage/filter/recon.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/storage/generic.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/storage/loopback.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/storage/mount.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/storage/node.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/storage/object.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/storage/server.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/storage/xfs.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/test_file.pp
+file path=usr/puppetlabs/puppet/modules/swift/manifests/xfs.pp
+file path=usr/puppetlabs/puppet/modules/swift/metadata.json
+file path=usr/puppetlabs/puppet/modules/swift/releasenotes/notes/container_sync-5869bca433355047.yaml
+file path=usr/puppetlabs/puppet/modules/swift/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
+file path=usr/puppetlabs/puppet/modules/swift/releasenotes/notes/mitaka_deprecation-3344541c884cfed8.yaml
+file path=usr/puppetlabs/puppet/modules/swift/releasenotes/notes/mitaka_features-52ecf51429531fbb.yaml
+file path=usr/puppetlabs/puppet/modules/swift/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
+file path=usr/puppetlabs/puppet/modules/swift/releasenotes/source/_static/.placeholder
+file path=usr/puppetlabs/puppet/modules/swift/releasenotes/source/conf.py
+file path=usr/puppetlabs/puppet/modules/swift/releasenotes/source/index.rst
+file path=usr/puppetlabs/puppet/modules/swift/releasenotes/source/mitaka.rst
+file path=usr/puppetlabs/puppet/modules/swift/releasenotes/source/unreleased.rst
+file path=usr/puppetlabs/puppet/modules/swift/setup.cfg
+file path=usr/puppetlabs/puppet/modules/swift/setup.py
+file path=usr/puppetlabs/puppet/modules/swift/spec/acceptance/basic_swift_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/acceptance/nodesets/centos-70-x64.yml
+file path=usr/puppetlabs/puppet/modules/swift/spec/acceptance/nodesets/default.yml
+file path=usr/puppetlabs/puppet/modules/swift/spec/acceptance/nodesets/nodepool-centos7.yml
+file path=usr/puppetlabs/puppet/modules/swift/spec/acceptance/nodesets/nodepool-trusty.yml
+file path=usr/puppetlabs/puppet/modules/swift/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+file path=usr/puppetlabs/puppet/modules/swift/spec/acceptance/swift_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_bench_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_client_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_dispersion_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_keystone_auth_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_keystone_dispersion_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_objectexpirer_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_proxy_account_quotas_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_proxy_authtoken_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_proxy_bulk_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_proxy_cache_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_proxy_catch_errors_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_proxy_ceilometer_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_proxy_container_quotas_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_proxy_container_sync_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_proxy_crossdomain_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_proxy_dlo_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_proxy_formpost_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_proxy_gatekeeper_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_proxy_healthcheck_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_proxy_keystone_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_proxy_ratelimit_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_proxy_s3token_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_proxy_slo_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_proxy_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_proxy_staticweb_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_proxy_swauth_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_proxy_swift3_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_proxy_tempauth_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_proxy_tempurl_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_ringbuilder_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_ringserver_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_storage_account_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_storage_all_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_storage_container_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_storage_object_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_storage_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_test_file_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/classes/swift_xfs_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/defines/swift_ringbuilder_create_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/defines/swift_ringbuilder_rebalance_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/defines/swift_storage_disk_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/defines/swift_storage_filter_healthcheck_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/defines/swift_storage_filter_recon_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/defines/swift_storage_generic_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/defines/swift_storage_loopback_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/defines/swift_storage_mount_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/defines/swift_storage_node_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/defines/swift_storage_server_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/defines/swift_storage_xfs_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/shared_examples.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/spec.opts
+file path=usr/puppetlabs/puppet/modules/swift/spec/spec_helper.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/spec_helper_acceptance.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/unit/provider/swift_account_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/unit/provider/swift_bench_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/unit/provider/swift_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/unit/provider/swift_container_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/unit/provider/swift_container_sync_realms_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/unit/provider/swift_dispersion_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/unit/provider/swift_object_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/unit/provider/swift_object_expirer_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/unit/provider/swift_proxy_config/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/unit/puppet/provider/service/swiftinit_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/unit/puppet/provider/swift_ring_builder_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/unit/puppet/type/ring_account_device_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/unit/puppet/type/ring_container_device_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/unit/puppet/type/ring_object_device_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/unit/type/swift_account_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/unit/type/swift_bench_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/unit/type/swift_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/unit/type/swift_container_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/unit/type/swift_container_sync_realms_config.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/unit/type/swift_dispersion_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/unit/type/swift_object_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/unit/type/swift_object_expirer_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/spec/unit/type/swift_proxy_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/swift/templates/account-server.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/container-server.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/object-server.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/proxy-server.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/proxy/account_quotas.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/proxy/authtoken.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/proxy/bulk.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/proxy/cache.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/proxy/catch_errors.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/proxy/ceilometer.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/proxy/container_quotas.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/proxy/container_sync.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/proxy/crossdomain.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/proxy/dlo.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/proxy/formpost.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/proxy/gatekeeper.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/proxy/healthcheck.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/proxy/keystone.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/proxy/proxy-logging.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/proxy/ratelimit.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/proxy/s3token.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/proxy/slo.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/proxy/staticweb.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/proxy/swauth.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/proxy/swift3.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/proxy/tempauth.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/proxy/tempurl.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/recon.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/rsyncd.conf.erb
+file path=usr/puppetlabs/puppet/modules/swift/templates/swift_keystone_test.erb
+file path=usr/puppetlabs/puppet/modules/swift/test-requirements.txt
+file path=usr/puppetlabs/puppet/modules/swift/tests/all.pp
+file path=usr/puppetlabs/puppet/modules/swift/tests/site.pp
+file path=usr/puppetlabs/puppet/modules/swift/tox.ini
 #
 license openstack-swift.license license="Apache v2.0"
 
--- a/components/ruby/puppet-modules/openstack-vswitch/openstack-vswitch.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet-modules/openstack-vswitch/openstack-vswitch.p5m	Mon Nov 28 16:54:02 2016 -0800
@@ -35,53 +35,53 @@
     value="org.opensolaris.category.2008:System/Enterprise Management"
 set name=info.upstream value="OpenStack <[email protected]>"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2016/194
+set name=org.opensolaris.arc-caseid value=PSARC/2016/194 value=PSARC/2016/607
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file path=etc/puppet/modules/vswitch/CHANGELOG.md
-file path=etc/puppet/modules/vswitch/Gemfile
-file path=etc/puppet/modules/vswitch/LICENSE
-file path=etc/puppet/modules/vswitch/README.md
-file path=etc/puppet/modules/vswitch/Rakefile
-file path=etc/puppet/modules/vswitch/checksums.json
-file path=etc/puppet/modules/vswitch/lib/facter/ovs.rb
-file path=etc/puppet/modules/vswitch/lib/puppet/provider/vs_bridge/ovs.rb
-file path=etc/puppet/modules/vswitch/lib/puppet/provider/vs_config/ovs.rb
-file path=etc/puppet/modules/vswitch/lib/puppet/provider/vs_port/ovs.rb
-file path=etc/puppet/modules/vswitch/lib/puppet/provider/vs_port/ovs_redhat.rb
-file path=etc/puppet/modules/vswitch/lib/puppet/provider/vs_port/ovs_redhat_el6.rb
-file path=etc/puppet/modules/vswitch/lib/puppet/type/vs_bridge.rb
-file path=etc/puppet/modules/vswitch/lib/puppet/type/vs_config.rb
-file path=etc/puppet/modules/vswitch/lib/puppet/type/vs_port.rb
-file path=etc/puppet/modules/vswitch/lib/puppetx/redhat/ifcfg.rb
-file path=etc/puppet/modules/vswitch/manifests/init.pp
-file path=etc/puppet/modules/vswitch/manifests/ovs.pp
-file path=etc/puppet/modules/vswitch/manifests/params.pp
-file path=etc/puppet/modules/vswitch/metadata.json
-file path=etc/puppet/modules/vswitch/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
-file path=etc/puppet/modules/vswitch/releasenotes/notes/mitaka_features-9ac623e2507113ea.yaml
-file path=etc/puppet/modules/vswitch/releasenotes/notes/mitaka_fix-f2f262d9c3e44955.yaml
-file path=etc/puppet/modules/vswitch/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
-file path=etc/puppet/modules/vswitch/releasenotes/source/_static/.placeholder
-file path=etc/puppet/modules/vswitch/releasenotes/source/conf.py
-file path=etc/puppet/modules/vswitch/releasenotes/source/index.rst
-file path=etc/puppet/modules/vswitch/releasenotes/source/unreleased.rst
-file path=etc/puppet/modules/vswitch/setup.cfg
-file path=etc/puppet/modules/vswitch/setup.py
-file path=etc/puppet/modules/vswitch/spec/acceptance/basic_vswitch_spec.rb
-file path=etc/puppet/modules/vswitch/spec/acceptance/nodesets/centos-70-x64.yml
-file path=etc/puppet/modules/vswitch/spec/acceptance/nodesets/default.yml
-file path=etc/puppet/modules/vswitch/spec/acceptance/nodesets/nodepool-centos7.yml
-file path=etc/puppet/modules/vswitch/spec/acceptance/nodesets/nodepool-trusty.yml
-file path=etc/puppet/modules/vswitch/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
-file path=etc/puppet/modules/vswitch/spec/classes/vswitch_ovs_spec.rb
-file path=etc/puppet/modules/vswitch/spec/shared_examples.rb
-file path=etc/puppet/modules/vswitch/spec/spec_helper.rb
-file path=etc/puppet/modules/vswitch/spec/spec_helper_acceptance.rb
-file path=etc/puppet/modules/vswitch/spec/unit/puppet/lib/provider/vs_config_ovs_spec.rb
-file path=etc/puppet/modules/vswitch/spec/unit/puppet/lib/type/vs_bridge_spec.rb
-file path=etc/puppet/modules/vswitch/spec/unit/puppet/lib/type/vs_config_spec.rb
-file path=etc/puppet/modules/vswitch/test-requirements.txt
-file path=etc/puppet/modules/vswitch/tox.ini
+file path=usr/puppetlabs/puppet/modules/vswitch/CHANGELOG.md
+file path=usr/puppetlabs/puppet/modules/vswitch/Gemfile
+file path=usr/puppetlabs/puppet/modules/vswitch/LICENSE
+file path=usr/puppetlabs/puppet/modules/vswitch/README.md
+file path=usr/puppetlabs/puppet/modules/vswitch/Rakefile
+file path=usr/puppetlabs/puppet/modules/vswitch/checksums.json
+file path=usr/puppetlabs/puppet/modules/vswitch/lib/facter/ovs.rb
+file path=usr/puppetlabs/puppet/modules/vswitch/lib/puppet/provider/vs_bridge/ovs.rb
+file path=usr/puppetlabs/puppet/modules/vswitch/lib/puppet/provider/vs_config/ovs.rb
+file path=usr/puppetlabs/puppet/modules/vswitch/lib/puppet/provider/vs_port/ovs.rb
+file path=usr/puppetlabs/puppet/modules/vswitch/lib/puppet/provider/vs_port/ovs_redhat.rb
+file path=usr/puppetlabs/puppet/modules/vswitch/lib/puppet/provider/vs_port/ovs_redhat_el6.rb
+file path=usr/puppetlabs/puppet/modules/vswitch/lib/puppet/type/vs_bridge.rb
+file path=usr/puppetlabs/puppet/modules/vswitch/lib/puppet/type/vs_config.rb
+file path=usr/puppetlabs/puppet/modules/vswitch/lib/puppet/type/vs_port.rb
+file path=usr/puppetlabs/puppet/modules/vswitch/lib/puppetx/redhat/ifcfg.rb
+file path=usr/puppetlabs/puppet/modules/vswitch/manifests/init.pp
+file path=usr/puppetlabs/puppet/modules/vswitch/manifests/ovs.pp
+file path=usr/puppetlabs/puppet/modules/vswitch/manifests/params.pp
+file path=usr/puppetlabs/puppet/modules/vswitch/metadata.json
+file path=usr/puppetlabs/puppet/modules/vswitch/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
+file path=usr/puppetlabs/puppet/modules/vswitch/releasenotes/notes/mitaka_features-9ac623e2507113ea.yaml
+file path=usr/puppetlabs/puppet/modules/vswitch/releasenotes/notes/mitaka_fix-f2f262d9c3e44955.yaml
+file path=usr/puppetlabs/puppet/modules/vswitch/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
+file path=usr/puppetlabs/puppet/modules/vswitch/releasenotes/source/_static/.placeholder
+file path=usr/puppetlabs/puppet/modules/vswitch/releasenotes/source/conf.py
+file path=usr/puppetlabs/puppet/modules/vswitch/releasenotes/source/index.rst
+file path=usr/puppetlabs/puppet/modules/vswitch/releasenotes/source/unreleased.rst
+file path=usr/puppetlabs/puppet/modules/vswitch/setup.cfg
+file path=usr/puppetlabs/puppet/modules/vswitch/setup.py
+file path=usr/puppetlabs/puppet/modules/vswitch/spec/acceptance/basic_vswitch_spec.rb
+file path=usr/puppetlabs/puppet/modules/vswitch/spec/acceptance/nodesets/centos-70-x64.yml
+file path=usr/puppetlabs/puppet/modules/vswitch/spec/acceptance/nodesets/default.yml
+file path=usr/puppetlabs/puppet/modules/vswitch/spec/acceptance/nodesets/nodepool-centos7.yml
+file path=usr/puppetlabs/puppet/modules/vswitch/spec/acceptance/nodesets/nodepool-trusty.yml
+file path=usr/puppetlabs/puppet/modules/vswitch/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+file path=usr/puppetlabs/puppet/modules/vswitch/spec/classes/vswitch_ovs_spec.rb
+file path=usr/puppetlabs/puppet/modules/vswitch/spec/shared_examples.rb
+file path=usr/puppetlabs/puppet/modules/vswitch/spec/spec_helper.rb
+file path=usr/puppetlabs/puppet/modules/vswitch/spec/spec_helper_acceptance.rb
+file path=usr/puppetlabs/puppet/modules/vswitch/spec/unit/puppet/lib/provider/vs_config_ovs_spec.rb
+file path=usr/puppetlabs/puppet/modules/vswitch/spec/unit/puppet/lib/type/vs_bridge_spec.rb
+file path=usr/puppetlabs/puppet/modules/vswitch/spec/unit/puppet/lib/type/vs_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/vswitch/test-requirements.txt
+file path=usr/puppetlabs/puppet/modules/vswitch/tox.ini
 #
 license openstack-vswitch.license license="Apache v2.0"
--- a/components/ruby/puppet-modules/oracle-solaris_providers/Makefile	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet-modules/oracle-solaris_providers/Makefile	Mon Nov 28 16:54:02 2016 -0800
@@ -26,12 +26,12 @@
 
 
 GIT_REPO= https://github.com/oracle/puppet-solaris_providers
-GIT_BRANCH= v1.2.2-userland
-GIT_COMMIT_ID= 519bc2aa
-GIT_HASH=  sha256:3276d213249c0e00dd90224c221bc450964f37b0ea49677fc4caecb1703b75a2
+GIT_BRANCH= v2.0.0
+GIT_COMMIT_ID= 4121a38
+GIT_HASH=  sha256:082fbc85bf5717990d88fdff80ca8ac9dd80ac5c7506bfa074cec06aa5c8c5a2
 
 COMPONENT_NAME=		puppet-solaris_providers
-COMPONENT_VERSION=	1.2.2
+COMPONENT_VERSION=	2.0.0
 COMPONENT_PROJECT_URL=	https://github.com/oracle/puppet-solaris_providers
 # Construct our own SRC instead of using the default with GIT_COMMIT_ID
 # archive from github strips leading v from release for vN named release tags
@@ -51,7 +51,7 @@
 # Dump a list of files installed in the proto dir but not in the manifest
 # this is a convenience target for the package maintainer
 new-files: install
-	$(PKGSEND) generate $(PROTO_DIR)/etc/puppet/modules/ | $(GSED)  -e 's/\(file\).*path=/\1 path=/' | \
+	$(PKGSEND) generate $(PROTO_DIR)/opt/puppetlabs/puppet/modules/ | $(GSED)  -e 's/\(file\).*path=/\1 path=/' | \
 	    $(CAT) oracle-solaris_providers.p5m - | $(GNU_GREP) -h '^file' | sort | uniq -c | \
 	    $(GSED) -e '/ 2 /d' -e 's/   1 //'
 
--- a/components/ruby/puppet-modules/oracle-solaris_providers/oracle-solaris_providers.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet-modules/oracle-solaris_providers/oracle-solaris_providers.p5m	Mon Nov 28 16:54:02 2016 -0800
@@ -23,11 +23,9 @@
 # Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
 #
 #
-<transform file dir -> default owner puppet>
-<transform file dir -> default group puppet>
 <transform file -> default mode 0444>
 <transform dir -> default mode 0755>
-<transform file dir -> edit path ^solaris_providers etc/puppet/modules/solaris_providers>
+<transform file dir -> edit path ^solaris_providers usr/puppetlabs/puppet/modules/solaris_providers>
 set name=pkg.fmri \
     value=pkg:/system/management/puppet/oracle-solaris_providers@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Oracle Solaris Providers Puppet Module"
@@ -44,12 +42,51 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2013/005 value=PSARC/2013/218 \
     value=PSARC/2013/221 value=PSARC/2013/288 value=PSARC/2013/426 \
-    value=PSARC/2016/016
+    value=PSARC/2016/016 value=PSARC/2016/607
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=solaris_providers/CHANGELOG.md
+file path=solaris_providers/CONTRIBUTING.md
 file path=solaris_providers/Gemfile
+file path=solaris_providers/Gemfiles/puppet-3.6.2
+file path=solaris_providers/Gemfiles/puppet-4.x
 file path=solaris_providers/LICENSE
 file path=solaris_providers/README.md
 file path=solaris_providers/Rakefile
+file path=solaris_providers/TESTING.md
+file path=solaris_providers/doc/address_object.md
+file path=solaris_providers/doc/address_properties.md
+file path=solaris_providers/doc/boot_environment.md
+file path=solaris_providers/doc/dns.md
+file path=solaris_providers/doc/etherstub.md
+file path=solaris_providers/doc/evs.md
+file path=solaris_providers/doc/evs_ipnet.md
+file path=solaris_providers/doc/evs_properties.md
+file path=solaris_providers/doc/evs_vport.md
+file path=solaris_providers/doc/ilb_healthcheck.md
+file path=solaris_providers/doc/ilb_rule.md
+file path=solaris_providers/doc/ilb_server.md
+file path=solaris_providers/doc/ilb_servergroup.md
+file path=solaris_providers/doc/interface_properties.md
+file path=solaris_providers/doc/ip_interface.md
+file path=solaris_providers/doc/ip_tunnel.md
+file path=solaris_providers/doc/ipmp_interface.md
+file path=solaris_providers/doc/ldap.md
+file path=solaris_providers/doc/link_aggregation.md
+file path=solaris_providers/doc/link_properties.md
+file path=solaris_providers/doc/nis.md
+file path=solaris_providers/doc/nsswitch.md
+file path=solaris_providers/doc/pkg_facet.md
+file path=solaris_providers/doc/pkg_mediator.md
+file path=solaris_providers/doc/pkg_publisher.md
+file path=solaris_providers/doc/pkg_variant.md
+file path=solaris_providers/doc/protocol_properties.md
+file path=solaris_providers/doc/solaris_vlan.md
+file path=solaris_providers/doc/svccfg.md
+file path=solaris_providers/doc/system_attributes.md
+file path=solaris_providers/doc/vni_interface.md
+file path=solaris_providers/doc/vnic.md
+file path=solaris_providers/doc/zfs_acl.md
+file path=solaris_providers/doc/zone.md
 file path=solaris_providers/lib/puppet/provider/address_object/solaris.rb
 file path=solaris_providers/lib/puppet/provider/address_properties/solaris.rb
 file path=solaris_providers/lib/puppet/provider/boot_environment/solaris.rb
@@ -59,6 +96,10 @@
 file path=solaris_providers/lib/puppet/provider/evs_ipnet/solaris.rb
 file path=solaris_providers/lib/puppet/provider/evs_properties/solaris.rb
 file path=solaris_providers/lib/puppet/provider/evs_vport/solaris.rb
+file path=solaris_providers/lib/puppet/provider/ilb_healthcheck/solaris.rb
+file path=solaris_providers/lib/puppet/provider/ilb_rule/solaris.rb
+file path=solaris_providers/lib/puppet/provider/ilb_server/solaris.rb
+file path=solaris_providers/lib/puppet/provider/ilb_servergroup/solaris.rb
 file path=solaris_providers/lib/puppet/provider/interface_properties/solaris.rb
 file path=solaris_providers/lib/puppet/provider/ip_interface/solaris.rb
 file path=solaris_providers/lib/puppet/provider/ip_tunnel/solaris.rb
@@ -75,8 +116,10 @@
 file path=solaris_providers/lib/puppet/provider/protocol_properties/solaris.rb
 file path=solaris_providers/lib/puppet/provider/solaris_vlan/solaris.rb
 file path=solaris_providers/lib/puppet/provider/svccfg/solaris.rb
+file path=solaris_providers/lib/puppet/provider/system_attributes/solaris.rb
 file path=solaris_providers/lib/puppet/provider/vni_interface/solaris.rb
 file path=solaris_providers/lib/puppet/provider/vnic/solaris.rb
+file path=solaris_providers/lib/puppet/provider/zfs_acl/solaris.rb
 file path=solaris_providers/lib/puppet/provider/zone/solaris.rb
 file path=solaris_providers/lib/puppet/type/address_object.rb
 file path=solaris_providers/lib/puppet/type/address_properties.rb
@@ -87,6 +130,10 @@
 file path=solaris_providers/lib/puppet/type/evs_ipnet.rb
 file path=solaris_providers/lib/puppet/type/evs_properties.rb
 file path=solaris_providers/lib/puppet/type/evs_vport.rb
+file path=solaris_providers/lib/puppet/type/ilb_healthcheck.rb
+file path=solaris_providers/lib/puppet/type/ilb_rule.rb
+file path=solaris_providers/lib/puppet/type/ilb_server.rb
+file path=solaris_providers/lib/puppet/type/ilb_servergroup.rb
 file path=solaris_providers/lib/puppet/type/interface_properties.rb
 file path=solaris_providers/lib/puppet/type/ip_interface.rb
 file path=solaris_providers/lib/puppet/type/ip_tunnel.rb
@@ -103,9 +150,15 @@
 file path=solaris_providers/lib/puppet/type/protocol_properties.rb
 file path=solaris_providers/lib/puppet/type/solaris_vlan.rb
 file path=solaris_providers/lib/puppet/type/svccfg.rb
+file path=solaris_providers/lib/puppet/type/system_attributes.rb
 file path=solaris_providers/lib/puppet/type/vni_interface.rb
 file path=solaris_providers/lib/puppet/type/vnic.rb
+file path=solaris_providers/lib/puppet/type/zfs_acl.rb
+file path=solaris_providers/lib/puppet/type/zfs_acl/ace.rb
 file path=solaris_providers/lib/puppet/type/zone.rb
+file path=solaris_providers/lib/puppet_x/oracle/solaris_providers/util.rb
+file path=solaris_providers/lib/puppet_x/oracle/solaris_providers/util/ilb.rb
+file path=solaris_providers/lib/puppet_x/oracle/solaris_providers/util/svcs.rb
 file path=solaris_providers/lib/puppet_x/oracle/solaris_providers/util/validation.rb
 file path=solaris_providers/metadata.json
 file path=solaris_providers/spec/acceptance/address_object_configure_spec.rb
@@ -120,33 +173,78 @@
 file path=solaris_providers/spec/acceptance/pkg_variant_configure_spec.rb
 file path=solaris_providers/spec/acceptance/zone_configure_spec.rb
 file path=solaris_providers/spec/fixtures/manifests/site.pp
+file path=solaris_providers/spec/fixtures/unit/provider/dns/dns/svcprop_p_config_Dns_fmri.txt
+file path=solaris_providers/spec/fixtures/unit/provider/ilb_healthcheck/ilb_healthcheck/show-healthcheck.txt
+file path=solaris_providers/spec/fixtures/unit/provider/ilb_rule/ilb_rule/show-rule_f.txt
+file path=solaris_providers/spec/fixtures/unit/provider/ilb_server/ilb_server/show-server_o_servergroup_serverid_status_p.txt
+file path=solaris_providers/spec/fixtures/unit/provider/ilb_server/ilb_server/show-servergroup_o_SGNAME_SERVERID_MINPORT_MAXPORT_IP_ADDRESS_p.txt
+file path=solaris_providers/spec/fixtures/unit/provider/ilb_servergroup/ilb_servergroup/show-servergroup_o_sgname_p.txt
+file path=solaris_providers/spec/fixtures/unit/provider/interface_properties/interface_properties/ipadm_show-ifprop_c_o_IFNAME-PROPERTY-PROTO-CURRENT-DEFAULT.txt
+file path=solaris_providers/spec/fixtures/unit/provider/ipmp_interface/ipmp_interface/show-if_p_o_IFNAME_CLASS_PERSISTENT_OVER.txt
+file path=solaris_providers/spec/fixtures/unit/provider/ldap/ldap/svcsprop_p_config_p_cred_Ldap_fmri.txt
+file path=solaris_providers/spec/fixtures/unit/provider/link_aggregation/link_aggregation/dladm_show-aggr-P-p-o.txt
+file path=solaris_providers/spec/fixtures/unit/provider/link_aggregation/link_aggregation/dladm_show-aggr-p-o.txt
+file path=solaris_providers/spec/fixtures/unit/provider/link_aggregation/link_aggregation/dladm_show-aggr-x-p-o_port_aggrX.txt
+file path=solaris_providers/spec/fixtures/unit/provider/link_aggregation/link_aggregation/dladm_show-linkprop_mac-address_link-value.txt
+file path=solaris_providers/spec/fixtures/unit/provider/nis/nis/svcsprop_p_config_Client_fmri.txt
+file path=solaris_providers/spec/fixtures/unit/provider/nis/nis/svcsprop_p_config_Domain_fmri.txt
 file path=solaris_providers/spec/fixtures/unit/provider/pkg/pkg_mediator/pkg_mediator.txt
 file path=solaris_providers/spec/fixtures/unit/provider/pkg/pkg_mediator/pkg_mediator_foo.txt
 file path=solaris_providers/spec/fixtures/unit/provider/svccfg/svccfg/svcprop_a_f.txt
+file path=solaris_providers/spec/fixtures/unit/provider/system_attributes/system_attributes/ls_c_root_foo.txt
+file path=solaris_providers/spec/fixtures/unit/provider/zfs_acl/zfs_acl/custom_perms.txt
+file path=solaris_providers/spec/fixtures/unit/provider/zfs_acl/zfs_acl/[email protected]
+file path=solaris_providers/spec/fixtures/unit/provider/zfs_acl/zfs_acl/[email protected]
+file path=solaris_providers/spec/fixtures/unit/provider/zfs_acl/zfs_acl/[email protected]
+file path=solaris_providers/spec/fixtures/unit/provider/zfs_acl/zfs_acl/default_perms.txt
+file path=solaris_providers/spec/fixtures/unit/provider/zfs_acl/zfs_acl/default_perms_deny.txt
+file path=solaris_providers/spec/fixtures/unit/provider/zfs_acl/zfs_acl/ls_v_root.txt
+file path=solaris_providers/spec/fixtures/unit/provider/zfs_acl/zfs_acl/ls_v_root.yaml
+file path=solaris_providers/spec/fixtures/unit/provider/zfs_acl/zfs_acl/ls_v_tmp_foo.txt
+file path=solaris_providers/spec/fixtures/unit/provider/zfs_acl/zfs_acl/ls_v_tmp_foo.yaml
+file path=solaris_providers/spec/fixtures/unit/provider/zfs_acl/zfs_acl/not_default_perms.txt
 file path=solaris_providers/spec/spec_helper.rb
 file path=solaris_providers/spec/spec_helper_acceptance.rb
-file path=solaris_providers/spec/unit/provider/address_object/address_object.rb
-file path=solaris_providers/spec/unit/provider/address_properties/address_properties.rb
-file path=solaris_providers/spec/unit/provider/dns/dns.rb
-file path=solaris_providers/spec/unit/provider/ldap/ldap.rb
-file path=solaris_providers/spec/unit/provider/nis/nis.rb
-file path=solaris_providers/spec/unit/provider/pkg/pkg_facet.rb
-file path=solaris_providers/spec/unit/provider/pkg/pkg_mediator.rb
+file path=solaris_providers/spec/unit/provider/address_object/address_object_spec.rb
+file path=solaris_providers/spec/unit/provider/address_properties/address_properties_spec.rb
+file path=solaris_providers/spec/unit/provider/dns/dns_spec.rb
+file path=solaris_providers/spec/unit/provider/ilb/ilb_spec.rb
+file path=solaris_providers/spec/unit/provider/ilb_healthcheck/ilb_healthcheck_spec.rb
+file path=solaris_providers/spec/unit/provider/ilb_rule/ilb_rule_spec.rb
+file path=solaris_providers/spec/unit/provider/ilb_server/ilb_server_spec.rb
+file path=solaris_providers/spec/unit/provider/ilb_servergroup/ilb_servergroup_spec.rb
+file path=solaris_providers/spec/unit/provider/interface_properties/interface_properties_spec.rb
+file path=solaris_providers/spec/unit/provider/ipmp_interface/ipmp_interface_spec.rb
+file path=solaris_providers/spec/unit/provider/ldap/ldap_spec.rb
+file path=solaris_providers/spec/unit/provider/link_aggregation/link_aggregation_spec.rb
+file path=solaris_providers/spec/unit/provider/nis/nis_spec.rb
+file path=solaris_providers/spec/unit/provider/pkg/pkg_facet_spec.rb
 file path=solaris_providers/spec/unit/provider/pkg/pkg_mediator_spec.rb
-file path=solaris_providers/spec/unit/provider/pkg/pkg_publisher.rb
-file path=solaris_providers/spec/unit/provider/pkg/pkg_variant.rb
+file path=solaris_providers/spec/unit/provider/pkg/pkg_publisher_spec.rb
+file path=solaris_providers/spec/unit/provider/pkg/pkg_variant_spec.rb
 file path=solaris_providers/spec/unit/provider/svccfg/svccfg_spec.rb
-file path=solaris_providers/spec/unit/provider/zone/zone.rb
+file path=solaris_providers/spec/unit/provider/system_attributes/system_attributes_spec.rb
+file path=solaris_providers/spec/unit/provider/zfs_acl/zfs_acl_spec.rb
+file path=solaris_providers/spec/unit/provider/zone/zone_spec.rb
 file path=solaris_providers/spec/unit/type/address_object_spec.rb
 file path=solaris_providers/spec/unit/type/address_properties_spec.rb
 file path=solaris_providers/spec/unit/type/dns_spec.rb
+file path=solaris_providers/spec/unit/type/ilb_healthcheck_spec.rb
+file path=solaris_providers/spec/unit/type/ilb_rule_spec.rb
+file path=solaris_providers/spec/unit/type/ilb_server_spec.rb
+file path=solaris_providers/spec/unit/type/ilb_servergroup_spec.rb
+file path=solaris_providers/spec/unit/type/interface_properties_spec.rb
+file path=solaris_providers/spec/unit/type/ipmp_interface_spec.rb
 file path=solaris_providers/spec/unit/type/ldap_spec.rb
+file path=solaris_providers/spec/unit/type/link_aggregation_spec.rb
 file path=solaris_providers/spec/unit/type/nis_spec.rb
 file path=solaris_providers/spec/unit/type/pkg_facet_spec.rb
 file path=solaris_providers/spec/unit/type/pkg_mediator_spec.rb
 file path=solaris_providers/spec/unit/type/pkg_publisher_spec.rb
 file path=solaris_providers/spec/unit/type/pkg_variant_spec.rb
 file path=solaris_providers/spec/unit/type/svccfg_spec.rb
+file path=solaris_providers/spec/unit/type/system_attributes_spec.rb
+file path=solaris_providers/spec/unit/type/zfs_acl_spec.rb
 file path=solaris_providers/spec/unit/type/zone_spec.rb
 license apache.license license="Apache v2.0"
 
--- a/components/ruby/puppet-modules/puppetlabs-apache/puppetlabs-apache.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet-modules/puppetlabs-apache/puppetlabs-apache.p5m	Mon Nov 28 16:54:02 2016 -0800
@@ -23,8 +23,6 @@
 # Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
-<transform file dir -> default owner puppet>
-<transform file dir -> default group puppet>
 set name=pkg.fmri \
     value=pkg:/system/management/puppet/puppetlabs-apache@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Apache Puppet Module"
@@ -39,318 +37,319 @@
 set name=info.upstream \
     value="puppetlabs - https://forge.puppetlabs.com/puppetlabs"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2015/368 value=PSARC/2016/016
+set name=org.opensolaris.arc-caseid value=PSARC/2015/368 value=PSARC/2016/016 \
+    value=PSARC/2016/607
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file path=etc/puppet/modules/apache/CHANGELOG.md
-file path=etc/puppet/modules/apache/CONTRIBUTING.md
-file path=etc/puppet/modules/apache/Gemfile
-file path=etc/puppet/modules/apache/LICENSE
-file path=etc/puppet/modules/apache/README.md
-file path=etc/puppet/modules/apache/Rakefile
-file path=etc/puppet/modules/apache/checksums.json
-file path=etc/puppet/modules/apache/examples/apache.pp
-file path=etc/puppet/modules/apache/examples/dev.pp
-file path=etc/puppet/modules/apache/examples/init.pp
-file path=etc/puppet/modules/apache/examples/mod_load_params.pp
-file path=etc/puppet/modules/apache/examples/mods.pp
-file path=etc/puppet/modules/apache/examples/mods_custom.pp
-file path=etc/puppet/modules/apache/examples/php.pp
-file path=etc/puppet/modules/apache/examples/vhost.pp
-file path=etc/puppet/modules/apache/examples/vhost_directories.pp
-file path=etc/puppet/modules/apache/examples/vhost_filter.pp
-file path=etc/puppet/modules/apache/examples/vhost_ip_based.pp
-file path=etc/puppet/modules/apache/examples/vhost_proxypass.pp
-file path=etc/puppet/modules/apache/examples/vhost_ssl.pp
-file path=etc/puppet/modules/apache/examples/vhosts_without_listen.pp
-file path=etc/puppet/modules/apache/files/httpd
-file path=etc/puppet/modules/apache/lib/puppet/parser/functions/bool2httpd.rb
-file path=etc/puppet/modules/apache/lib/puppet/parser/functions/enclose_ipv6.rb
-file path=etc/puppet/modules/apache/lib/puppet/parser/functions/validate_apache_log_level.rb
-file path=etc/puppet/modules/apache/lib/puppet/provider/a2mod.rb
-file path=etc/puppet/modules/apache/lib/puppet/provider/a2mod/a2mod.rb
-file path=etc/puppet/modules/apache/lib/puppet/provider/a2mod/gentoo.rb
-file path=etc/puppet/modules/apache/lib/puppet/provider/a2mod/modfix.rb
-file path=etc/puppet/modules/apache/lib/puppet/provider/a2mod/redhat.rb
-file path=etc/puppet/modules/apache/lib/puppet/type/a2mod.rb
-file path=etc/puppet/modules/apache/manifests/balancer.pp
-file path=etc/puppet/modules/apache/manifests/balancermember.pp
-file path=etc/puppet/modules/apache/manifests/confd/no_accf.pp
-file path=etc/puppet/modules/apache/manifests/custom_config.pp
-file path=etc/puppet/modules/apache/manifests/default_confd_files.pp
-file path=etc/puppet/modules/apache/manifests/default_mods.pp
-file path=etc/puppet/modules/apache/manifests/default_mods/load.pp
-file path=etc/puppet/modules/apache/manifests/dev.pp
-file path=etc/puppet/modules/apache/manifests/fastcgi/server.pp
-file path=etc/puppet/modules/apache/manifests/init.pp
-file path=etc/puppet/modules/apache/manifests/listen.pp
-file path=etc/puppet/modules/apache/manifests/mod.pp
-file path=etc/puppet/modules/apache/manifests/mod/actions.pp
-file path=etc/puppet/modules/apache/manifests/mod/alias.pp
-file path=etc/puppet/modules/apache/manifests/mod/auth_basic.pp
-file path=etc/puppet/modules/apache/manifests/mod/auth_cas.pp
-file path=etc/puppet/modules/apache/manifests/mod/auth_kerb.pp
-file path=etc/puppet/modules/apache/manifests/mod/auth_mellon.pp
-file path=etc/puppet/modules/apache/manifests/mod/authn_core.pp
-file path=etc/puppet/modules/apache/manifests/mod/authn_file.pp
-file path=etc/puppet/modules/apache/manifests/mod/authnz_ldap.pp
-file path=etc/puppet/modules/apache/manifests/mod/authz_default.pp
-file path=etc/puppet/modules/apache/manifests/mod/authz_user.pp
-file path=etc/puppet/modules/apache/manifests/mod/autoindex.pp
-file path=etc/puppet/modules/apache/manifests/mod/cache.pp
-file path=etc/puppet/modules/apache/manifests/mod/cgi.pp
-file path=etc/puppet/modules/apache/manifests/mod/cgid.pp
-file path=etc/puppet/modules/apache/manifests/mod/dav.pp
-file path=etc/puppet/modules/apache/manifests/mod/dav_fs.pp
-file path=etc/puppet/modules/apache/manifests/mod/dav_svn.pp
-file path=etc/puppet/modules/apache/manifests/mod/deflate.pp
-file path=etc/puppet/modules/apache/manifests/mod/dev.pp
-file path=etc/puppet/modules/apache/manifests/mod/dir.pp
-file path=etc/puppet/modules/apache/manifests/mod/disk_cache.pp
-file path=etc/puppet/modules/apache/manifests/mod/event.pp
-file path=etc/puppet/modules/apache/manifests/mod/expires.pp
-file path=etc/puppet/modules/apache/manifests/mod/ext_filter.pp
-file path=etc/puppet/modules/apache/manifests/mod/fastcgi.pp
-file path=etc/puppet/modules/apache/manifests/mod/fcgid.pp
-file path=etc/puppet/modules/apache/manifests/mod/filter.pp
-file path=etc/puppet/modules/apache/manifests/mod/geoip.pp
-file path=etc/puppet/modules/apache/manifests/mod/headers.pp
-file path=etc/puppet/modules/apache/manifests/mod/include.pp
-file path=etc/puppet/modules/apache/manifests/mod/info.pp
-file path=etc/puppet/modules/apache/manifests/mod/itk.pp
-file path=etc/puppet/modules/apache/manifests/mod/ldap.pp
-file path=etc/puppet/modules/apache/manifests/mod/mime.pp
-file path=etc/puppet/modules/apache/manifests/mod/mime_magic.pp
-file path=etc/puppet/modules/apache/manifests/mod/negotiation.pp
-file path=etc/puppet/modules/apache/manifests/mod/nss.pp
-file path=etc/puppet/modules/apache/manifests/mod/pagespeed.pp
-file path=etc/puppet/modules/apache/manifests/mod/passenger.pp
-file path=etc/puppet/modules/apache/manifests/mod/perl.pp
-file path=etc/puppet/modules/apache/manifests/mod/peruser.pp
-file path=etc/puppet/modules/apache/manifests/mod/php.pp
-file path=etc/puppet/modules/apache/manifests/mod/prefork.pp
-file path=etc/puppet/modules/apache/manifests/mod/proxy.pp
-file path=etc/puppet/modules/apache/manifests/mod/proxy_ajp.pp
-file path=etc/puppet/modules/apache/manifests/mod/proxy_balancer.pp
-file path=etc/puppet/modules/apache/manifests/mod/proxy_connect.pp
-file path=etc/puppet/modules/apache/manifests/mod/proxy_html.pp
-file path=etc/puppet/modules/apache/manifests/mod/proxy_http.pp
-file path=etc/puppet/modules/apache/manifests/mod/python.pp
-file path=etc/puppet/modules/apache/manifests/mod/remoteip.pp
-file path=etc/puppet/modules/apache/manifests/mod/reqtimeout.pp
-file path=etc/puppet/modules/apache/manifests/mod/rewrite.pp
-file path=etc/puppet/modules/apache/manifests/mod/rpaf.pp
-file path=etc/puppet/modules/apache/manifests/mod/security.pp
-file path=etc/puppet/modules/apache/manifests/mod/setenvif.pp
-file path=etc/puppet/modules/apache/manifests/mod/shib.pp
-file path=etc/puppet/modules/apache/manifests/mod/speling.pp
-file path=etc/puppet/modules/apache/manifests/mod/ssl.pp
-file path=etc/puppet/modules/apache/manifests/mod/status.pp
-file path=etc/puppet/modules/apache/manifests/mod/suexec.pp
-file path=etc/puppet/modules/apache/manifests/mod/suphp.pp
-file path=etc/puppet/modules/apache/manifests/mod/userdir.pp
-file path=etc/puppet/modules/apache/manifests/mod/version.pp
-file path=etc/puppet/modules/apache/manifests/mod/vhost_alias.pp
-file path=etc/puppet/modules/apache/manifests/mod/worker.pp
-file path=etc/puppet/modules/apache/manifests/mod/wsgi.pp
-file path=etc/puppet/modules/apache/manifests/mod/xsendfile.pp
-file path=etc/puppet/modules/apache/manifests/mpm.pp
-file path=etc/puppet/modules/apache/manifests/namevirtualhost.pp
-file path=etc/puppet/modules/apache/manifests/package.pp
-file path=etc/puppet/modules/apache/manifests/params.pp
-file path=etc/puppet/modules/apache/manifests/peruser/multiplexer.pp
-file path=etc/puppet/modules/apache/manifests/peruser/processor.pp
-file path=etc/puppet/modules/apache/manifests/php.pp
-file path=etc/puppet/modules/apache/manifests/proxy.pp
-file path=etc/puppet/modules/apache/manifests/python.pp
-file path=etc/puppet/modules/apache/manifests/security/rule_link.pp
-file path=etc/puppet/modules/apache/manifests/service.pp
-file path=etc/puppet/modules/apache/manifests/ssl.pp
-file path=etc/puppet/modules/apache/manifests/version.pp
-file path=etc/puppet/modules/apache/manifests/vhost.pp
-file path=etc/puppet/modules/apache/manifests/vhost/custom.pp
-file path=etc/puppet/modules/apache/metadata.json
-file path=etc/puppet/modules/apache/spec/acceptance/apache_parameters_spec.rb
-file path=etc/puppet/modules/apache/spec/acceptance/apache_ssl_spec.rb
-file path=etc/puppet/modules/apache/spec/acceptance/class_spec.rb
-file path=etc/puppet/modules/apache/spec/acceptance/custom_config_spec.rb
-file path=etc/puppet/modules/apache/spec/acceptance/default_mods_spec.rb
-file path=etc/puppet/modules/apache/spec/acceptance/itk_spec.rb
-file path=etc/puppet/modules/apache/spec/acceptance/mod_dav_svn_spec.rb
-file path=etc/puppet/modules/apache/spec/acceptance/mod_deflate_spec.rb
-file path=etc/puppet/modules/apache/spec/acceptance/mod_fcgid_spec.rb
-file path=etc/puppet/modules/apache/spec/acceptance/mod_mime_spec.rb
-file path=etc/puppet/modules/apache/spec/acceptance/mod_negotiation_spec.rb
-file path=etc/puppet/modules/apache/spec/acceptance/mod_pagespeed_spec.rb
-file path=etc/puppet/modules/apache/spec/acceptance/mod_passenger_spec.rb
-file path=etc/puppet/modules/apache/spec/acceptance/mod_php_spec.rb
-file path=etc/puppet/modules/apache/spec/acceptance/mod_proxy_html_spec.rb
-file path=etc/puppet/modules/apache/spec/acceptance/mod_security_spec.rb
-file path=etc/puppet/modules/apache/spec/acceptance/mod_suphp_spec.rb
-file path=etc/puppet/modules/apache/spec/acceptance/nodesets/centos-70-x64.yml
-file path=etc/puppet/modules/apache/spec/acceptance/nodesets/debian-607-x64.yml
-file path=etc/puppet/modules/apache/spec/acceptance/nodesets/debian-70rc1-x64.yml
-file path=etc/puppet/modules/apache/spec/acceptance/nodesets/debian-73-i386.yml
-file path=etc/puppet/modules/apache/spec/acceptance/nodesets/debian-73-x64.yml
-file path=etc/puppet/modules/apache/spec/acceptance/nodesets/debian-82-x64.yml
-file path=etc/puppet/modules/apache/spec/acceptance/nodesets/default.yml
-file path=etc/puppet/modules/apache/spec/acceptance/nodesets/fedora-18-x64.yml
-file path=etc/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
-file path=etc/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
-file path=etc/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml
-file path=etc/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
-file path=etc/puppet/modules/apache/spec/acceptance/prefork_worker_spec.rb
-file path=etc/puppet/modules/apache/spec/acceptance/service_spec.rb
-file path=etc/puppet/modules/apache/spec/acceptance/version.rb
-file path=etc/puppet/modules/apache/spec/acceptance/vhost_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/apache_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/dev_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/alias_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/auth_cas_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/auth_kerb_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/auth_mellon_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/authnz_ldap_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/dav_svn_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/deflate_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/dev_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/dir_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/disk_cache.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/event_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/expires_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/ext_filter_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/fastcgi_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/fcgid_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/info_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/itk_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/ldap_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/mime_magic_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/mime_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/negotiation_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/pagespeed_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/passenger_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/perl_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/peruser_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/php_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/prefork_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/proxy_connect_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/proxy_html_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/python_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/remoteip_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/reqtimeout_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/rpaf_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/security_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/shib_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/speling_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/ssl_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/status_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/suphp_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/worker_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/mod/wsgi_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/params_spec.rb
-file path=etc/puppet/modules/apache/spec/classes/service_spec.rb
-file path=etc/puppet/modules/apache/spec/defines/balancermember_spec.rb
-file path=etc/puppet/modules/apache/spec/defines/custom_config_spec.rb
-file path=etc/puppet/modules/apache/spec/defines/fastcgi_server_spec.rb
-file path=etc/puppet/modules/apache/spec/defines/mod_spec.rb
-file path=etc/puppet/modules/apache/spec/defines/modsec_link_spec.rb
-file path=etc/puppet/modules/apache/spec/defines/vhost_custom_spec.rb
-file path=etc/puppet/modules/apache/spec/defines/vhost_spec.rb
-file path=etc/puppet/modules/apache/spec/spec.opts
-file path=etc/puppet/modules/apache/spec/spec_helper.rb
-file path=etc/puppet/modules/apache/spec/spec_helper_acceptance.rb
-file path=etc/puppet/modules/apache/spec/unit/provider/a2mod/gentoo_spec.rb
-file path=etc/puppet/modules/apache/spec/unit/puppet/parser/functions/bool2httpd_spec.rb
-file path=etc/puppet/modules/apache/spec/unit/puppet/parser/functions/enclose_ipv6_spec.rb
-file path=etc/puppet/modules/apache/spec/unit/puppet/parser/functions/validate_apache_log_level.rb
-file path=etc/puppet/modules/apache/templates/confd/no-accf.conf.erb
-file path=etc/puppet/modules/apache/templates/fastcgi/server.erb
-file path=etc/puppet/modules/apache/templates/httpd.conf.erb
-file path=etc/puppet/modules/apache/templates/listen.erb
-file path=etc/puppet/modules/apache/templates/mod/alias.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/auth_cas.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/auth_mellon.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/authnz_ldap.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/autoindex.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/cgid.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/dav_fs.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/deflate.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/dir.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/disk_cache.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/event.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/expires.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/ext_filter.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/fastcgi.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/geoip.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/info.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/itk.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/ldap.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/load.erb
-file path=etc/puppet/modules/apache/templates/mod/mime.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/mime_magic.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/mpm_event.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/negotiation.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/nss.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/pagespeed.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/passenger.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/peruser.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/php5.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/prefork.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/proxy.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/proxy_html.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/remoteip.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/reqtimeout.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/rpaf.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/security.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/security_crs.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/setenvif.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/ssl.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/status.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/suphp.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/unixd_fcgid.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/userdir.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/worker.conf.erb
-file path=etc/puppet/modules/apache/templates/mod/wsgi.conf.erb
-file path=etc/puppet/modules/apache/templates/namevirtualhost.erb
-file path=etc/puppet/modules/apache/templates/ports_header.erb
-file path=etc/puppet/modules/apache/templates/vhost/_access_log.erb
-file path=etc/puppet/modules/apache/templates/vhost/_action.erb
-file path=etc/puppet/modules/apache/templates/vhost/_additional_includes.erb
-file path=etc/puppet/modules/apache/templates/vhost/_aliases.erb
-file path=etc/puppet/modules/apache/templates/vhost/_allow_encoded_slashes.erb
-file path=etc/puppet/modules/apache/templates/vhost/_auth_kerb.erb
-file path=etc/puppet/modules/apache/templates/vhost/_block.erb
-file path=etc/puppet/modules/apache/templates/vhost/_charsets.erb
-file path=etc/puppet/modules/apache/templates/vhost/_custom_fragment.erb
-file path=etc/puppet/modules/apache/templates/vhost/_directories.erb
-file path=etc/puppet/modules/apache/templates/vhost/_docroot.erb
-file path=etc/puppet/modules/apache/templates/vhost/_error_document.erb
-file path=etc/puppet/modules/apache/templates/vhost/_fallbackresource.erb
-file path=etc/puppet/modules/apache/templates/vhost/_fastcgi.erb
-file path=etc/puppet/modules/apache/templates/vhost/_file_footer.erb
-file path=etc/puppet/modules/apache/templates/vhost/_file_header.erb
-file path=etc/puppet/modules/apache/templates/vhost/_filters.erb
-file path=etc/puppet/modules/apache/templates/vhost/_header.erb
-file path=etc/puppet/modules/apache/templates/vhost/_itk.erb
-file path=etc/puppet/modules/apache/templates/vhost/_logging.erb
-file path=etc/puppet/modules/apache/templates/vhost/_passenger.erb
-file path=etc/puppet/modules/apache/templates/vhost/_passenger_base_uris.erb
-file path=etc/puppet/modules/apache/templates/vhost/_php.erb
-file path=etc/puppet/modules/apache/templates/vhost/_php_admin.erb
-file path=etc/puppet/modules/apache/templates/vhost/_proxy.erb
-file path=etc/puppet/modules/apache/templates/vhost/_rack.erb
-file path=etc/puppet/modules/apache/templates/vhost/_redirect.erb
-file path=etc/puppet/modules/apache/templates/vhost/_requestheader.erb
-file path=etc/puppet/modules/apache/templates/vhost/_rewrite.erb
-file path=etc/puppet/modules/apache/templates/vhost/_scriptalias.erb
-file path=etc/puppet/modules/apache/templates/vhost/_security.erb
-file path=etc/puppet/modules/apache/templates/vhost/_serveralias.erb
-file path=etc/puppet/modules/apache/templates/vhost/_serversignature.erb
-file path=etc/puppet/modules/apache/templates/vhost/_setenv.erb
-file path=etc/puppet/modules/apache/templates/vhost/_ssl.erb
-file path=etc/puppet/modules/apache/templates/vhost/_sslproxy.erb
-file path=etc/puppet/modules/apache/templates/vhost/_suexec.erb
-file path=etc/puppet/modules/apache/templates/vhost/_suphp.erb
-file path=etc/puppet/modules/apache/templates/vhost/_wsgi.erb
+file path=usr/puppetlabs/puppet/modules/apache/CHANGELOG.md
+file path=usr/puppetlabs/puppet/modules/apache/CONTRIBUTING.md
+file path=usr/puppetlabs/puppet/modules/apache/Gemfile
+file path=usr/puppetlabs/puppet/modules/apache/LICENSE
+file path=usr/puppetlabs/puppet/modules/apache/README.md
+file path=usr/puppetlabs/puppet/modules/apache/Rakefile
+file path=usr/puppetlabs/puppet/modules/apache/checksums.json
+file path=usr/puppetlabs/puppet/modules/apache/examples/apache.pp
+file path=usr/puppetlabs/puppet/modules/apache/examples/dev.pp
+file path=usr/puppetlabs/puppet/modules/apache/examples/init.pp
+file path=usr/puppetlabs/puppet/modules/apache/examples/mod_load_params.pp
+file path=usr/puppetlabs/puppet/modules/apache/examples/mods.pp
+file path=usr/puppetlabs/puppet/modules/apache/examples/mods_custom.pp
+file path=usr/puppetlabs/puppet/modules/apache/examples/php.pp
+file path=usr/puppetlabs/puppet/modules/apache/examples/vhost.pp
+file path=usr/puppetlabs/puppet/modules/apache/examples/vhost_directories.pp
+file path=usr/puppetlabs/puppet/modules/apache/examples/vhost_filter.pp
+file path=usr/puppetlabs/puppet/modules/apache/examples/vhost_ip_based.pp
+file path=usr/puppetlabs/puppet/modules/apache/examples/vhost_proxypass.pp
+file path=usr/puppetlabs/puppet/modules/apache/examples/vhost_ssl.pp
+file path=usr/puppetlabs/puppet/modules/apache/examples/vhosts_without_listen.pp
+file path=usr/puppetlabs/puppet/modules/apache/files/httpd
+file path=usr/puppetlabs/puppet/modules/apache/lib/puppet/parser/functions/bool2httpd.rb
+file path=usr/puppetlabs/puppet/modules/apache/lib/puppet/parser/functions/enclose_ipv6.rb
+file path=usr/puppetlabs/puppet/modules/apache/lib/puppet/parser/functions/validate_apache_log_level.rb
+file path=usr/puppetlabs/puppet/modules/apache/lib/puppet/provider/a2mod.rb
+file path=usr/puppetlabs/puppet/modules/apache/lib/puppet/provider/a2mod/a2mod.rb
+file path=usr/puppetlabs/puppet/modules/apache/lib/puppet/provider/a2mod/gentoo.rb
+file path=usr/puppetlabs/puppet/modules/apache/lib/puppet/provider/a2mod/modfix.rb
+file path=usr/puppetlabs/puppet/modules/apache/lib/puppet/provider/a2mod/redhat.rb
+file path=usr/puppetlabs/puppet/modules/apache/lib/puppet/type/a2mod.rb
+file path=usr/puppetlabs/puppet/modules/apache/manifests/balancer.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/balancermember.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/confd/no_accf.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/custom_config.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/default_confd_files.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/default_mods.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/default_mods/load.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/dev.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/fastcgi/server.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/init.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/listen.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/actions.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/alias.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/auth_basic.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/auth_cas.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/auth_kerb.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/auth_mellon.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/authn_core.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/authn_file.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/authnz_ldap.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/authz_default.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/authz_user.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/autoindex.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/cache.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/cgi.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/cgid.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/dav.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/dav_fs.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/dav_svn.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/deflate.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/dev.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/dir.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/disk_cache.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/event.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/expires.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/ext_filter.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/fastcgi.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/fcgid.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/filter.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/geoip.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/headers.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/include.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/info.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/itk.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/ldap.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/mime.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/mime_magic.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/negotiation.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/nss.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/pagespeed.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/passenger.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/perl.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/peruser.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/php.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/prefork.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/proxy.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/proxy_ajp.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/proxy_balancer.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/proxy_connect.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/proxy_html.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/proxy_http.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/python.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/remoteip.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/reqtimeout.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/rewrite.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/rpaf.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/security.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/setenvif.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/shib.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/speling.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/ssl.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/status.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/suexec.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/suphp.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/userdir.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/version.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/vhost_alias.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/worker.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/wsgi.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mod/xsendfile.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/mpm.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/namevirtualhost.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/package.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/params.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/peruser/multiplexer.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/peruser/processor.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/php.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/proxy.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/python.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/security/rule_link.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/service.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/ssl.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/version.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/vhost.pp
+file path=usr/puppetlabs/puppet/modules/apache/manifests/vhost/custom.pp
+file path=usr/puppetlabs/puppet/modules/apache/metadata.json
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/apache_parameters_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/apache_ssl_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/class_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/custom_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/default_mods_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/itk_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/mod_dav_svn_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/mod_deflate_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/mod_fcgid_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/mod_mime_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/mod_negotiation_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/mod_pagespeed_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/mod_passenger_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/mod_php_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/mod_proxy_html_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/mod_security_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/mod_suphp_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/nodesets/centos-70-x64.yml
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/nodesets/debian-607-x64.yml
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/nodesets/debian-70rc1-x64.yml
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/nodesets/debian-73-i386.yml
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/nodesets/debian-73-x64.yml
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/nodesets/debian-82-x64.yml
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/nodesets/default.yml
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/nodesets/fedora-18-x64.yml
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/prefork_worker_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/service_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/version.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/acceptance/vhost_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/apache_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/dev_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/alias_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/auth_cas_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/auth_kerb_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/auth_mellon_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/authnz_ldap_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/dav_svn_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/deflate_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/dev_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/dir_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/disk_cache.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/event_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/expires_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/ext_filter_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/fastcgi_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/fcgid_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/info_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/itk_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/ldap_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/mime_magic_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/mime_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/negotiation_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/pagespeed_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/passenger_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/perl_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/peruser_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/php_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/prefork_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/proxy_connect_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/proxy_html_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/python_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/remoteip_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/reqtimeout_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/rpaf_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/security_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/shib_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/speling_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/ssl_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/status_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/suphp_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/worker_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/mod/wsgi_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/params_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/classes/service_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/defines/balancermember_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/defines/custom_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/defines/fastcgi_server_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/defines/mod_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/defines/modsec_link_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/defines/vhost_custom_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/defines/vhost_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/spec.opts
+file path=usr/puppetlabs/puppet/modules/apache/spec/spec_helper.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/spec_helper_acceptance.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/unit/provider/a2mod/gentoo_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/unit/puppet/parser/functions/bool2httpd_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/unit/puppet/parser/functions/enclose_ipv6_spec.rb
+file path=usr/puppetlabs/puppet/modules/apache/spec/unit/puppet/parser/functions/validate_apache_log_level.rb
+file path=usr/puppetlabs/puppet/modules/apache/templates/confd/no-accf.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/fastcgi/server.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/httpd.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/listen.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/alias.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/auth_cas.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/auth_mellon.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/authnz_ldap.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/autoindex.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/cgid.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/dav_fs.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/deflate.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/dir.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/disk_cache.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/event.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/expires.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/ext_filter.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/fastcgi.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/geoip.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/info.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/itk.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/ldap.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/load.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/mime.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/mime_magic.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/mpm_event.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/negotiation.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/nss.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/pagespeed.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/passenger.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/peruser.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/php5.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/prefork.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/proxy.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/proxy_html.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/remoteip.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/reqtimeout.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/rpaf.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/security.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/security_crs.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/setenvif.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/ssl.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/status.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/suphp.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/unixd_fcgid.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/userdir.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/worker.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/mod/wsgi.conf.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/namevirtualhost.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/ports_header.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_access_log.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_action.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_additional_includes.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_aliases.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_allow_encoded_slashes.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_auth_kerb.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_block.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_charsets.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_custom_fragment.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_directories.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_docroot.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_error_document.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_fallbackresource.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_fastcgi.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_file_footer.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_file_header.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_filters.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_header.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_itk.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_logging.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_passenger.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_passenger_base_uris.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_php.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_php_admin.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_proxy.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_rack.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_redirect.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_requestheader.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_rewrite.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_scriptalias.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_security.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_serveralias.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_serversignature.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_setenv.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_ssl.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_sslproxy.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_suexec.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_suphp.erb
+file path=usr/puppetlabs/puppet/modules/apache/templates/vhost/_wsgi.erb
 #
 license LICENSE license="Apache v2.0"
 # Renamed Package
--- a/components/ruby/puppet-modules/puppetlabs-concat/puppetlabs-concat.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet-modules/puppetlabs-concat/puppetlabs-concat.p5m	Mon Nov 28 16:54:02 2016 -0800
@@ -23,8 +23,6 @@
 # Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
-<transform file dir -> default owner puppet>
-<transform file dir -> default group puppet>
 set name=pkg.fmri \
     value=pkg:/system/management/puppet/puppetlabs-concat@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Concat Puppet Module"
@@ -38,62 +36,63 @@
 set name=info.upstream \
     value="puppetlabs - https://forge.puppetlabs.com/puppetlabs"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2015/368 value=PSARC/2016/016
+set name=org.opensolaris.arc-caseid value=PSARC/2015/368 value=PSARC/2016/016 \
+    value=PSARC/2016/607
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file path=etc/puppet/modules/concat/CHANGELOG.md
-file path=etc/puppet/modules/concat/CONTRIBUTING.md
-file path=etc/puppet/modules/concat/Gemfile
-file path=etc/puppet/modules/concat/LICENSE
-file path=etc/puppet/modules/concat/README.md
-file path=etc/puppet/modules/concat/Rakefile
-file path=etc/puppet/modules/concat/checksums.json
-file path=etc/puppet/modules/concat/files/concatfragments.rb
-file path=etc/puppet/modules/concat/lib/facter/concat_basedir.rb
-file path=etc/puppet/modules/concat/lib/puppet/parser/functions/concat_getparam.rb
-file path=etc/puppet/modules/concat/lib/puppet/parser/functions/concat_is_bool.rb
-file path=etc/puppet/modules/concat/manifests/fragment.pp
-file path=etc/puppet/modules/concat/manifests/init.pp
-file path=etc/puppet/modules/concat/manifests/setup.pp
-file path=etc/puppet/modules/concat/metadata.json
-file path=etc/puppet/modules/concat/spec/acceptance/backup_spec.rb
-file path=etc/puppet/modules/concat/spec/acceptance/concat_spec.rb
-file path=etc/puppet/modules/concat/spec/acceptance/deprecation_warnings_spec.rb
-file path=etc/puppet/modules/concat/spec/acceptance/empty_spec.rb
-file path=etc/puppet/modules/concat/spec/acceptance/fragment_source_spec.rb
-file path=etc/puppet/modules/concat/spec/acceptance/fragments_are_always_replaced_spec.rb
-file path=etc/puppet/modules/concat/spec/acceptance/newline_spec.rb
-file path=etc/puppet/modules/concat/spec/acceptance/nodesets/aix-71-vcloud.yml
-file path=etc/puppet/modules/concat/spec/acceptance/nodesets/centos-59-x64.yml
-file path=etc/puppet/modules/concat/spec/acceptance/nodesets/centos-64-x64-pe.yml
-file path=etc/puppet/modules/concat/spec/acceptance/nodesets/centos-64-x64.yml
-file path=etc/puppet/modules/concat/spec/acceptance/nodesets/centos-65-x64.yml
-file path=etc/puppet/modules/concat/spec/acceptance/nodesets/debian-607-x64.yml
-file path=etc/puppet/modules/concat/spec/acceptance/nodesets/debian-70rc1-x64.yml
-file path=etc/puppet/modules/concat/spec/acceptance/nodesets/debian-73-x64.yml
-file path=etc/puppet/modules/concat/spec/acceptance/nodesets/default.yml
-file path=etc/puppet/modules/concat/spec/acceptance/nodesets/fedora-18-x64.yml
-file path=etc/puppet/modules/concat/spec/acceptance/nodesets/sles-11-x64.yml
-file path=etc/puppet/modules/concat/spec/acceptance/nodesets/sles-11sp1-x64.yml
-file path=etc/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
-file path=etc/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
-file path=etc/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
-file path=etc/puppet/modules/concat/spec/acceptance/order_spec.rb
-file path=etc/puppet/modules/concat/spec/acceptance/quoted_paths_spec.rb
-file path=etc/puppet/modules/concat/spec/acceptance/replace_spec.rb
-file path=etc/puppet/modules/concat/spec/acceptance/specinfra_stubs.rb
-file path=etc/puppet/modules/concat/spec/acceptance/symbolic_name_spec.rb
-file path=etc/puppet/modules/concat/spec/acceptance/validation_spec.rb
-file path=etc/puppet/modules/concat/spec/acceptance/warn_spec.rb
-file path=etc/puppet/modules/concat/spec/spec.opts
-file path=etc/puppet/modules/concat/spec/spec_helper.rb
-file path=etc/puppet/modules/concat/spec/spec_helper_acceptance.rb
-file path=etc/puppet/modules/concat/spec/unit/classes/concat_setup_spec.rb
-file path=etc/puppet/modules/concat/spec/unit/defines/concat_fragment_spec.rb
-file path=etc/puppet/modules/concat/spec/unit/defines/concat_spec.rb
-file path=etc/puppet/modules/concat/spec/unit/facts/concat_basedir_spec.rb
-file path=etc/puppet/modules/concat/tests/fragment.pp
-file path=etc/puppet/modules/concat/tests/init.pp
+file path=usr/puppetlabs/puppet/modules/concat/CHANGELOG.md
+file path=usr/puppetlabs/puppet/modules/concat/CONTRIBUTING.md
+file path=usr/puppetlabs/puppet/modules/concat/Gemfile
+file path=usr/puppetlabs/puppet/modules/concat/LICENSE
+file path=usr/puppetlabs/puppet/modules/concat/README.md
+file path=usr/puppetlabs/puppet/modules/concat/Rakefile
+file path=usr/puppetlabs/puppet/modules/concat/checksums.json
+file path=usr/puppetlabs/puppet/modules/concat/files/concatfragments.rb
+file path=usr/puppetlabs/puppet/modules/concat/lib/facter/concat_basedir.rb
+file path=usr/puppetlabs/puppet/modules/concat/lib/puppet/parser/functions/concat_getparam.rb
+file path=usr/puppetlabs/puppet/modules/concat/lib/puppet/parser/functions/concat_is_bool.rb
+file path=usr/puppetlabs/puppet/modules/concat/manifests/fragment.pp
+file path=usr/puppetlabs/puppet/modules/concat/manifests/init.pp
+file path=usr/puppetlabs/puppet/modules/concat/manifests/setup.pp
+file path=usr/puppetlabs/puppet/modules/concat/metadata.json
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/backup_spec.rb
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/concat_spec.rb
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/deprecation_warnings_spec.rb
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/empty_spec.rb
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/fragment_source_spec.rb
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/fragments_are_always_replaced_spec.rb
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/newline_spec.rb
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/nodesets/aix-71-vcloud.yml
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/nodesets/centos-59-x64.yml
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/nodesets/centos-64-x64-pe.yml
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/nodesets/centos-64-x64.yml
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/nodesets/centos-65-x64.yml
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/nodesets/debian-607-x64.yml
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/nodesets/debian-70rc1-x64.yml
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/nodesets/debian-73-x64.yml
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/nodesets/default.yml
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/nodesets/fedora-18-x64.yml
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/nodesets/sles-11-x64.yml
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/nodesets/sles-11sp1-x64.yml
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/order_spec.rb
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/quoted_paths_spec.rb
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/replace_spec.rb
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/specinfra_stubs.rb
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/symbolic_name_spec.rb
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/validation_spec.rb
+file path=usr/puppetlabs/puppet/modules/concat/spec/acceptance/warn_spec.rb
+file path=usr/puppetlabs/puppet/modules/concat/spec/spec.opts
+file path=usr/puppetlabs/puppet/modules/concat/spec/spec_helper.rb
+file path=usr/puppetlabs/puppet/modules/concat/spec/spec_helper_acceptance.rb
+file path=usr/puppetlabs/puppet/modules/concat/spec/unit/classes/concat_setup_spec.rb
+file path=usr/puppetlabs/puppet/modules/concat/spec/unit/defines/concat_fragment_spec.rb
+file path=usr/puppetlabs/puppet/modules/concat/spec/unit/defines/concat_spec.rb
+file path=usr/puppetlabs/puppet/modules/concat/spec/unit/facts/concat_basedir_spec.rb
+file path=usr/puppetlabs/puppet/modules/concat/tests/fragment.pp
+file path=usr/puppetlabs/puppet/modules/concat/tests/init.pp
 #
 license puppetlabs-concat.license license="Apache v2.0"
 # Renamed Package
--- a/components/ruby/puppet-modules/puppetlabs-inifile/puppetlabs-inifile.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet-modules/puppetlabs-inifile/puppetlabs-inifile.p5m	Mon Nov 28 16:54:02 2016 -0800
@@ -23,8 +23,6 @@
 # Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
-<transform file dir -> default owner puppet>
-<transform file dir -> default group puppet>
 set name=pkg.fmri \
     value=pkg:/system/management/puppet/puppetlabs-inifile@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Inifile Puppet Module"
@@ -38,61 +36,62 @@
 set name=info.upstream \
     value="puppetlabs - https://forge.puppetlabs.com/puppetlabs"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2015/368 value=PSARC/2016/016
+set name=org.opensolaris.arc-caseid value=PSARC/2015/368 value=PSARC/2016/016 \
+    value=PSARC/2016/607
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file path=etc/puppet/modules/inifile/CHANGELOG.md
-file path=etc/puppet/modules/inifile/CONTRIBUTING.md
-file path=etc/puppet/modules/inifile/Gemfile
-file path=etc/puppet/modules/inifile/LICENSE
-file path=etc/puppet/modules/inifile/README.markdown
-file path=etc/puppet/modules/inifile/Rakefile
-file path=etc/puppet/modules/inifile/checksums.json
-file path=etc/puppet/modules/inifile/examples/ini_setting.pp
-file path=etc/puppet/modules/inifile/examples/ini_subsetting.pp
-file path=etc/puppet/modules/inifile/lib/puppet/parser/functions/create_ini_settings.rb
-file path=etc/puppet/modules/inifile/lib/puppet/provider/ini_setting/ruby.rb
-file path=etc/puppet/modules/inifile/lib/puppet/provider/ini_subsetting/ruby.rb
-file path=etc/puppet/modules/inifile/lib/puppet/type/ini_setting.rb
-file path=etc/puppet/modules/inifile/lib/puppet/type/ini_subsetting.rb
-file path=etc/puppet/modules/inifile/lib/puppet/util/external_iterator.rb
-file path=etc/puppet/modules/inifile/lib/puppet/util/ini_file.rb
-file path=etc/puppet/modules/inifile/lib/puppet/util/ini_file/section.rb
-file path=etc/puppet/modules/inifile/lib/puppet/util/setting_value.rb
-file path=etc/puppet/modules/inifile/metadata.json
-file path=etc/puppet/modules/inifile/spec/acceptance/ini_setting_spec.rb
-file path=etc/puppet/modules/inifile/spec/acceptance/ini_subsetting_spec.rb
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/centos-510-x64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/centos-59-x64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/centos-64-x64-pe.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/centos-64-x64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/centos-65-x64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/debian-607-x64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/debian-73-x64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/default.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/fedora-18-x64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/sles-11sp1-x64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/windows-2003-i386.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/windows-2003r2-x86_64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/windows-2008-x86_64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/windows-2008r2-x86_64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/windows-2012-x86_64.yml
-file path=etc/puppet/modules/inifile/spec/acceptance/nodesets/windows-2012r2-x86_64.yml
-file path=etc/puppet/modules/inifile/spec/classes/create_ini_settings_test_spec.rb
-file path=etc/puppet/modules/inifile/spec/classes/inherit_test1_spec.rb
-file path=etc/puppet/modules/inifile/spec/functions/create_ini_settings_spec.rb
-file path=etc/puppet/modules/inifile/spec/spec.opts
-file path=etc/puppet/modules/inifile/spec/spec_helper.rb
-file path=etc/puppet/modules/inifile/spec/spec_helper_acceptance.rb
-file path=etc/puppet/modules/inifile/spec/unit/puppet/provider/ini_setting/inheritance_spec.rb
-file path=etc/puppet/modules/inifile/spec/unit/puppet/provider/ini_setting/ruby_spec.rb
-file path=etc/puppet/modules/inifile/spec/unit/puppet/provider/ini_subsetting/ruby_spec.rb
-file path=etc/puppet/modules/inifile/spec/unit/puppet/util/external_iterator_spec.rb
-file path=etc/puppet/modules/inifile/spec/unit/puppet/util/ini_file_spec.rb
-file path=etc/puppet/modules/inifile/spec/unit/puppet/util/setting_value_spec.rb
+file path=usr/puppetlabs/puppet/modules/inifile/CHANGELOG.md
+file path=usr/puppetlabs/puppet/modules/inifile/CONTRIBUTING.md
+file path=usr/puppetlabs/puppet/modules/inifile/Gemfile
+file path=usr/puppetlabs/puppet/modules/inifile/LICENSE
+file path=usr/puppetlabs/puppet/modules/inifile/README.markdown
+file path=usr/puppetlabs/puppet/modules/inifile/Rakefile
+file path=usr/puppetlabs/puppet/modules/inifile/checksums.json
+file path=usr/puppetlabs/puppet/modules/inifile/examples/ini_setting.pp
+file path=usr/puppetlabs/puppet/modules/inifile/examples/ini_subsetting.pp
+file path=usr/puppetlabs/puppet/modules/inifile/lib/puppet/parser/functions/create_ini_settings.rb
+file path=usr/puppetlabs/puppet/modules/inifile/lib/puppet/provider/ini_setting/ruby.rb
+file path=usr/puppetlabs/puppet/modules/inifile/lib/puppet/provider/ini_subsetting/ruby.rb
+file path=usr/puppetlabs/puppet/modules/inifile/lib/puppet/type/ini_setting.rb
+file path=usr/puppetlabs/puppet/modules/inifile/lib/puppet/type/ini_subsetting.rb
+file path=usr/puppetlabs/puppet/modules/inifile/lib/puppet/util/external_iterator.rb
+file path=usr/puppetlabs/puppet/modules/inifile/lib/puppet/util/ini_file.rb
+file path=usr/puppetlabs/puppet/modules/inifile/lib/puppet/util/ini_file/section.rb
+file path=usr/puppetlabs/puppet/modules/inifile/lib/puppet/util/setting_value.rb
+file path=usr/puppetlabs/puppet/modules/inifile/metadata.json
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/ini_setting_spec.rb
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/ini_subsetting_spec.rb
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/centos-510-x64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/centos-59-x64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/centos-64-x64-pe.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/centos-64-x64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/centos-65-x64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/debian-607-x64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/debian-73-x64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/default.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/fedora-18-x64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/sles-11sp1-x64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/windows-2003-i386.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/windows-2003r2-x86_64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/windows-2008-x86_64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/windows-2008r2-x86_64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/windows-2012-x86_64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/acceptance/nodesets/windows-2012r2-x86_64.yml
+file path=usr/puppetlabs/puppet/modules/inifile/spec/classes/create_ini_settings_test_spec.rb
+file path=usr/puppetlabs/puppet/modules/inifile/spec/classes/inherit_test1_spec.rb
+file path=usr/puppetlabs/puppet/modules/inifile/spec/functions/create_ini_settings_spec.rb
+file path=usr/puppetlabs/puppet/modules/inifile/spec/spec.opts
+file path=usr/puppetlabs/puppet/modules/inifile/spec/spec_helper.rb
+file path=usr/puppetlabs/puppet/modules/inifile/spec/spec_helper_acceptance.rb
+file path=usr/puppetlabs/puppet/modules/inifile/spec/unit/puppet/provider/ini_setting/inheritance_spec.rb
+file path=usr/puppetlabs/puppet/modules/inifile/spec/unit/puppet/provider/ini_setting/ruby_spec.rb
+file path=usr/puppetlabs/puppet/modules/inifile/spec/unit/puppet/provider/ini_subsetting/ruby_spec.rb
+file path=usr/puppetlabs/puppet/modules/inifile/spec/unit/puppet/util/external_iterator_spec.rb
+file path=usr/puppetlabs/puppet/modules/inifile/spec/unit/puppet/util/ini_file_spec.rb
+file path=usr/puppetlabs/puppet/modules/inifile/spec/unit/puppet/util/setting_value_spec.rb
 #
 license puppetlabs-inifile.license license="Apache v2.0"
 # Renamed Package
--- a/components/ruby/puppet-modules/puppetlabs-mysql/puppetlabs-mysql.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet-modules/puppetlabs-mysql/puppetlabs-mysql.p5m	Mon Nov 28 16:54:02 2016 -0800
@@ -23,8 +23,6 @@
 # Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
-<transform file dir -> default owner puppet>
-<transform file dir -> default group puppet>
 set name=pkg.fmri \
     value=pkg:/system/management/puppet/puppetlabs-mysql@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Mysql Puppet Module"
@@ -38,119 +36,120 @@
 set name=info.upstream \
     value="puppetlabs - https://forge.puppetlabs.com/puppetlabs"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2015/368 value=PSARC/2016/016
+set name=org.opensolaris.arc-caseid value=PSARC/2015/368 value=PSARC/2016/016 \
+    value=PSARC/2016/607
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file path=etc/puppet/modules/mysql/CHANGELOG.md
-file path=etc/puppet/modules/mysql/CONTRIBUTING.md
-file path=etc/puppet/modules/mysql/Gemfile
-file path=etc/puppet/modules/mysql/LICENSE
-file path=etc/puppet/modules/mysql/README.md
-file path=etc/puppet/modules/mysql/Rakefile
-file path=etc/puppet/modules/mysql/TODO
-file path=etc/puppet/modules/mysql/checksums.json
-file path=etc/puppet/modules/mysql/examples/backup.pp
-file path=etc/puppet/modules/mysql/examples/bindings.pp
-file path=etc/puppet/modules/mysql/examples/java.pp
-file path=etc/puppet/modules/mysql/examples/mysql_database.pp
-file path=etc/puppet/modules/mysql/examples/mysql_db.pp
-file path=etc/puppet/modules/mysql/examples/mysql_grant.pp
-file path=etc/puppet/modules/mysql/examples/mysql_plugin.pp
-file path=etc/puppet/modules/mysql/examples/mysql_user.pp
-file path=etc/puppet/modules/mysql/examples/perl.pp
-file path=etc/puppet/modules/mysql/examples/python.pp
-file path=etc/puppet/modules/mysql/examples/ruby.pp
-file path=etc/puppet/modules/mysql/examples/server.pp
-file path=etc/puppet/modules/mysql/examples/server/account_security.pp
-file path=etc/puppet/modules/mysql/examples/server/config.pp
-file path=etc/puppet/modules/mysql/lib/facter/mysql_server_id.rb
-file path=etc/puppet/modules/mysql/lib/facter/mysql_version.rb
-file path=etc/puppet/modules/mysql/lib/puppet/parser/functions/mysql_deepmerge.rb
-file path=etc/puppet/modules/mysql/lib/puppet/parser/functions/mysql_dirname.rb
-file path=etc/puppet/modules/mysql/lib/puppet/parser/functions/mysql_password.rb
-file path=etc/puppet/modules/mysql/lib/puppet/parser/functions/mysql_strip_hash.rb
-file path=etc/puppet/modules/mysql/lib/puppet/provider/mysql.rb
-file path=etc/puppet/modules/mysql/lib/puppet/provider/mysql_database/mysql.rb
-file path=etc/puppet/modules/mysql/lib/puppet/provider/mysql_grant/mysql.rb
-file path=etc/puppet/modules/mysql/lib/puppet/provider/mysql_plugin/mysql.rb
-file path=etc/puppet/modules/mysql/lib/puppet/provider/mysql_user/mysql.rb
-file path=etc/puppet/modules/mysql/lib/puppet/type/mysql_database.rb
-file path=etc/puppet/modules/mysql/lib/puppet/type/mysql_grant.rb
-file path=etc/puppet/modules/mysql/lib/puppet/type/mysql_plugin.rb
-file path=etc/puppet/modules/mysql/lib/puppet/type/mysql_user.rb
-file path=etc/puppet/modules/mysql/manifests/backup/mysqlbackup.pp
-file path=etc/puppet/modules/mysql/manifests/backup/mysqldump.pp
-file path=etc/puppet/modules/mysql/manifests/backup/xtrabackup.pp
-file path=etc/puppet/modules/mysql/manifests/bindings.pp
-file path=etc/puppet/modules/mysql/manifests/bindings/client_dev.pp
-file path=etc/puppet/modules/mysql/manifests/bindings/daemon_dev.pp
-file path=etc/puppet/modules/mysql/manifests/bindings/java.pp
-file path=etc/puppet/modules/mysql/manifests/bindings/perl.pp
-file path=etc/puppet/modules/mysql/manifests/bindings/php.pp
-file path=etc/puppet/modules/mysql/manifests/bindings/python.pp
-file path=etc/puppet/modules/mysql/manifests/bindings/ruby.pp
-file path=etc/puppet/modules/mysql/manifests/client.pp
-file path=etc/puppet/modules/mysql/manifests/client/install.pp
-file path=etc/puppet/modules/mysql/manifests/db.pp
-file path=etc/puppet/modules/mysql/manifests/params.pp
-file path=etc/puppet/modules/mysql/manifests/server.pp
-file path=etc/puppet/modules/mysql/manifests/server/account_security.pp
-file path=etc/puppet/modules/mysql/manifests/server/backup.pp
-file path=etc/puppet/modules/mysql/manifests/server/config.pp
-file path=etc/puppet/modules/mysql/manifests/server/install.pp
-file path=etc/puppet/modules/mysql/manifests/server/installdb.pp
-file path=etc/puppet/modules/mysql/manifests/server/monitor.pp
-file path=etc/puppet/modules/mysql/manifests/server/mysqltuner.pp
-file path=etc/puppet/modules/mysql/manifests/server/providers.pp
-file path=etc/puppet/modules/mysql/manifests/server/root_password.pp
-file path=etc/puppet/modules/mysql/manifests/server/service.pp
-file path=etc/puppet/modules/mysql/metadata.json
-file path=etc/puppet/modules/mysql/spec/acceptance/mysql_backup_spec.rb
-file path=etc/puppet/modules/mysql/spec/acceptance/mysql_db_spec.rb
-file path=etc/puppet/modules/mysql/spec/acceptance/mysql_server_spec.rb
-file path=etc/puppet/modules/mysql/spec/acceptance/nodesets/centos-510-x64.yml
-file path=etc/puppet/modules/mysql/spec/acceptance/nodesets/centos-59-x64.yml
-file path=etc/puppet/modules/mysql/spec/acceptance/nodesets/centos-64-x64-pe.yml
-file path=etc/puppet/modules/mysql/spec/acceptance/nodesets/centos-65-x64.yml
-file path=etc/puppet/modules/mysql/spec/acceptance/nodesets/default.yml
-file path=etc/puppet/modules/mysql/spec/acceptance/nodesets/fedora-18-x64.yml
-file path=etc/puppet/modules/mysql/spec/acceptance/nodesets/sles-11-x64.yml
-file path=etc/puppet/modules/mysql/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
-file path=etc/puppet/modules/mysql/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
-file path=etc/puppet/modules/mysql/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
-file path=etc/puppet/modules/mysql/spec/acceptance/types/mysql_database_spec.rb
-file path=etc/puppet/modules/mysql/spec/acceptance/types/mysql_grant_spec.rb
-file path=etc/puppet/modules/mysql/spec/acceptance/types/mysql_plugin_spec.rb
-file path=etc/puppet/modules/mysql/spec/acceptance/types/mysql_user_spec.rb
-file path=etc/puppet/modules/mysql/spec/classes/graceful_failures_spec.rb
-file path=etc/puppet/modules/mysql/spec/classes/mycnf_template_spec.rb
-file path=etc/puppet/modules/mysql/spec/classes/mysql_bindings_spec.rb
-file path=etc/puppet/modules/mysql/spec/classes/mysql_client_spec.rb
-file path=etc/puppet/modules/mysql/spec/classes/mysql_server_account_security_spec.rb
-file path=etc/puppet/modules/mysql/spec/classes/mysql_server_backup_spec.rb
-file path=etc/puppet/modules/mysql/spec/classes/mysql_server_monitor_spec.rb
-file path=etc/puppet/modules/mysql/spec/classes/mysql_server_mysqltuner_spec.rb
-file path=etc/puppet/modules/mysql/spec/classes/mysql_server_spec.rb
-file path=etc/puppet/modules/mysql/spec/defines/mysql_db_spec.rb
-file path=etc/puppet/modules/mysql/spec/spec.opts
-file path=etc/puppet/modules/mysql/spec/spec_helper.rb
-file path=etc/puppet/modules/mysql/spec/spec_helper_acceptance.rb
-file path=etc/puppet/modules/mysql/spec/unit/facter/mysql_server_id_spec.rb
-file path=etc/puppet/modules/mysql/spec/unit/facter/mysql_version_spec.rb
-file path=etc/puppet/modules/mysql/spec/unit/puppet/functions/mysql_deepmerge_spec.rb
-file path=etc/puppet/modules/mysql/spec/unit/puppet/functions/mysql_password_spec.rb
-file path=etc/puppet/modules/mysql/spec/unit/puppet/provider/mysql_database/mysql_spec.rb
-file path=etc/puppet/modules/mysql/spec/unit/puppet/provider/mysql_plugin/mysql_spec.rb
-file path=etc/puppet/modules/mysql/spec/unit/puppet/provider/mysql_user/mysql_spec.rb
-file path=etc/puppet/modules/mysql/spec/unit/puppet/type/mysql_database_spec.rb
-file path=etc/puppet/modules/mysql/spec/unit/puppet/type/mysql_grant_spec.rb
-file path=etc/puppet/modules/mysql/spec/unit/puppet/type/mysql_plugin_spec.rb
-file path=etc/puppet/modules/mysql/spec/unit/puppet/type/mysql_user_spec.rb
-file path=etc/puppet/modules/mysql/templates/meb.cnf.erb
-file path=etc/puppet/modules/mysql/templates/my.cnf.erb
-file path=etc/puppet/modules/mysql/templates/my.cnf.pass.erb
-file path=etc/puppet/modules/mysql/templates/mysqlbackup.sh.erb
-file path=etc/puppet/modules/mysql/templates/xtrabackup.sh.erb
+file path=usr/puppetlabs/puppet/modules/mysql/CHANGELOG.md
+file path=usr/puppetlabs/puppet/modules/mysql/CONTRIBUTING.md
+file path=usr/puppetlabs/puppet/modules/mysql/Gemfile
+file path=usr/puppetlabs/puppet/modules/mysql/LICENSE
+file path=usr/puppetlabs/puppet/modules/mysql/README.md
+file path=usr/puppetlabs/puppet/modules/mysql/Rakefile
+file path=usr/puppetlabs/puppet/modules/mysql/TODO
+file path=usr/puppetlabs/puppet/modules/mysql/checksums.json
+file path=usr/puppetlabs/puppet/modules/mysql/examples/backup.pp
+file path=usr/puppetlabs/puppet/modules/mysql/examples/bindings.pp
+file path=usr/puppetlabs/puppet/modules/mysql/examples/java.pp
+file path=usr/puppetlabs/puppet/modules/mysql/examples/mysql_database.pp
+file path=usr/puppetlabs/puppet/modules/mysql/examples/mysql_db.pp
+file path=usr/puppetlabs/puppet/modules/mysql/examples/mysql_grant.pp
+file path=usr/puppetlabs/puppet/modules/mysql/examples/mysql_plugin.pp
+file path=usr/puppetlabs/puppet/modules/mysql/examples/mysql_user.pp
+file path=usr/puppetlabs/puppet/modules/mysql/examples/perl.pp
+file path=usr/puppetlabs/puppet/modules/mysql/examples/python.pp
+file path=usr/puppetlabs/puppet/modules/mysql/examples/ruby.pp
+file path=usr/puppetlabs/puppet/modules/mysql/examples/server.pp
+file path=usr/puppetlabs/puppet/modules/mysql/examples/server/account_security.pp
+file path=usr/puppetlabs/puppet/modules/mysql/examples/server/config.pp
+file path=usr/puppetlabs/puppet/modules/mysql/lib/facter/mysql_server_id.rb
+file path=usr/puppetlabs/puppet/modules/mysql/lib/facter/mysql_version.rb
+file path=usr/puppetlabs/puppet/modules/mysql/lib/puppet/parser/functions/mysql_deepmerge.rb
+file path=usr/puppetlabs/puppet/modules/mysql/lib/puppet/parser/functions/mysql_dirname.rb
+file path=usr/puppetlabs/puppet/modules/mysql/lib/puppet/parser/functions/mysql_password.rb
+file path=usr/puppetlabs/puppet/modules/mysql/lib/puppet/parser/functions/mysql_strip_hash.rb
+file path=usr/puppetlabs/puppet/modules/mysql/lib/puppet/provider/mysql.rb
+file path=usr/puppetlabs/puppet/modules/mysql/lib/puppet/provider/mysql_database/mysql.rb
+file path=usr/puppetlabs/puppet/modules/mysql/lib/puppet/provider/mysql_grant/mysql.rb
+file path=usr/puppetlabs/puppet/modules/mysql/lib/puppet/provider/mysql_plugin/mysql.rb
+file path=usr/puppetlabs/puppet/modules/mysql/lib/puppet/provider/mysql_user/mysql.rb
+file path=usr/puppetlabs/puppet/modules/mysql/lib/puppet/type/mysql_database.rb
+file path=usr/puppetlabs/puppet/modules/mysql/lib/puppet/type/mysql_grant.rb
+file path=usr/puppetlabs/puppet/modules/mysql/lib/puppet/type/mysql_plugin.rb
+file path=usr/puppetlabs/puppet/modules/mysql/lib/puppet/type/mysql_user.rb
+file path=usr/puppetlabs/puppet/modules/mysql/manifests/backup/mysqlbackup.pp
+file path=usr/puppetlabs/puppet/modules/mysql/manifests/backup/mysqldump.pp
+file path=usr/puppetlabs/puppet/modules/mysql/manifests/backup/xtrabackup.pp
+file path=usr/puppetlabs/puppet/modules/mysql/manifests/bindings.pp
+file path=usr/puppetlabs/puppet/modules/mysql/manifests/bindings/client_dev.pp
+file path=usr/puppetlabs/puppet/modules/mysql/manifests/bindings/daemon_dev.pp
+file path=usr/puppetlabs/puppet/modules/mysql/manifests/bindings/java.pp
+file path=usr/puppetlabs/puppet/modules/mysql/manifests/bindings/perl.pp
+file path=usr/puppetlabs/puppet/modules/mysql/manifests/bindings/php.pp
+file path=usr/puppetlabs/puppet/modules/mysql/manifests/bindings/python.pp
+file path=usr/puppetlabs/puppet/modules/mysql/manifests/bindings/ruby.pp
+file path=usr/puppetlabs/puppet/modules/mysql/manifests/client.pp
+file path=usr/puppetlabs/puppet/modules/mysql/manifests/client/install.pp
+file path=usr/puppetlabs/puppet/modules/mysql/manifests/db.pp
+file path=usr/puppetlabs/puppet/modules/mysql/manifests/params.pp
+file path=usr/puppetlabs/puppet/modules/mysql/manifests/server.pp
+file path=usr/puppetlabs/puppet/modules/mysql/manifests/server/account_security.pp
+file path=usr/puppetlabs/puppet/modules/mysql/manifests/server/backup.pp
+file path=usr/puppetlabs/puppet/modules/mysql/manifests/server/config.pp
+file path=usr/puppetlabs/puppet/modules/mysql/manifests/server/install.pp
+file path=usr/puppetlabs/puppet/modules/mysql/manifests/server/installdb.pp
+file path=usr/puppetlabs/puppet/modules/mysql/manifests/server/monitor.pp
+file path=usr/puppetlabs/puppet/modules/mysql/manifests/server/mysqltuner.pp
+file path=usr/puppetlabs/puppet/modules/mysql/manifests/server/providers.pp
+file path=usr/puppetlabs/puppet/modules/mysql/manifests/server/root_password.pp
+file path=usr/puppetlabs/puppet/modules/mysql/manifests/server/service.pp
+file path=usr/puppetlabs/puppet/modules/mysql/metadata.json
+file path=usr/puppetlabs/puppet/modules/mysql/spec/acceptance/mysql_backup_spec.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/acceptance/mysql_db_spec.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/acceptance/mysql_server_spec.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/acceptance/nodesets/centos-510-x64.yml
+file path=usr/puppetlabs/puppet/modules/mysql/spec/acceptance/nodesets/centos-59-x64.yml
+file path=usr/puppetlabs/puppet/modules/mysql/spec/acceptance/nodesets/centos-64-x64-pe.yml
+file path=usr/puppetlabs/puppet/modules/mysql/spec/acceptance/nodesets/centos-65-x64.yml
+file path=usr/puppetlabs/puppet/modules/mysql/spec/acceptance/nodesets/default.yml
+file path=usr/puppetlabs/puppet/modules/mysql/spec/acceptance/nodesets/fedora-18-x64.yml
+file path=usr/puppetlabs/puppet/modules/mysql/spec/acceptance/nodesets/sles-11-x64.yml
+file path=usr/puppetlabs/puppet/modules/mysql/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+file path=usr/puppetlabs/puppet/modules/mysql/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+file path=usr/puppetlabs/puppet/modules/mysql/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+file path=usr/puppetlabs/puppet/modules/mysql/spec/acceptance/types/mysql_database_spec.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/acceptance/types/mysql_grant_spec.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/acceptance/types/mysql_plugin_spec.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/acceptance/types/mysql_user_spec.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/classes/graceful_failures_spec.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/classes/mycnf_template_spec.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/classes/mysql_bindings_spec.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/classes/mysql_client_spec.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/classes/mysql_server_account_security_spec.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/classes/mysql_server_backup_spec.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/classes/mysql_server_monitor_spec.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/classes/mysql_server_mysqltuner_spec.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/classes/mysql_server_spec.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/defines/mysql_db_spec.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/spec.opts
+file path=usr/puppetlabs/puppet/modules/mysql/spec/spec_helper.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/spec_helper_acceptance.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/unit/facter/mysql_server_id_spec.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/unit/facter/mysql_version_spec.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/unit/puppet/functions/mysql_deepmerge_spec.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/unit/puppet/functions/mysql_password_spec.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/unit/puppet/provider/mysql_database/mysql_spec.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/unit/puppet/provider/mysql_plugin/mysql_spec.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/unit/puppet/provider/mysql_user/mysql_spec.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/unit/puppet/type/mysql_database_spec.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/unit/puppet/type/mysql_grant_spec.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/unit/puppet/type/mysql_plugin_spec.rb
+file path=usr/puppetlabs/puppet/modules/mysql/spec/unit/puppet/type/mysql_user_spec.rb
+file path=usr/puppetlabs/puppet/modules/mysql/templates/meb.cnf.erb
+file path=usr/puppetlabs/puppet/modules/mysql/templates/my.cnf.erb
+file path=usr/puppetlabs/puppet/modules/mysql/templates/my.cnf.pass.erb
+file path=usr/puppetlabs/puppet/modules/mysql/templates/mysqlbackup.sh.erb
+file path=usr/puppetlabs/puppet/modules/mysql/templates/xtrabackup.sh.erb
 #
 license puppetlabs-mysql.license license="Apache v2.0"
 # Renamed Package
--- a/components/ruby/puppet-modules/puppetlabs-ntp/puppetlabs-ntp.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet-modules/puppetlabs-ntp/puppetlabs-ntp.p5m	Mon Nov 28 16:54:02 2016 -0800
@@ -23,8 +23,6 @@
 # Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
-<transform file dir -> default owner puppet>
-<transform file dir -> default group puppet>
 set name=pkg.fmri \
     value=pkg:/system/management/puppet/puppetlabs-ntp@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="NTP Puppet Module"
@@ -38,53 +36,54 @@
 set name=info.upstream \
     value="puppetlabs - https://forge.puppetlabs.com/puppetlabs"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2015/368 value=PSARC/2016/016
+set name=org.opensolaris.arc-caseid value=PSARC/2015/368 value=PSARC/2016/016 \
+    value=PSARC/2016/607
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file path=etc/puppet/modules/ntp/CHANGELOG.md
-file path=etc/puppet/modules/ntp/CONTRIBUTING.md
-file path=etc/puppet/modules/ntp/Gemfile
-file path=etc/puppet/modules/ntp/LICENSE
-file path=etc/puppet/modules/ntp/README.markdown
-file path=etc/puppet/modules/ntp/Rakefile
-file path=etc/puppet/modules/ntp/checksums.json
-file path=etc/puppet/modules/ntp/lib/puppet/parser/functions/ntp_dirname.rb
-file path=etc/puppet/modules/ntp/manifests/config.pp
-file path=etc/puppet/modules/ntp/manifests/init.pp
-file path=etc/puppet/modules/ntp/manifests/install.pp
-file path=etc/puppet/modules/ntp/manifests/params.pp
-file path=etc/puppet/modules/ntp/manifests/service.pp
-file path=etc/puppet/modules/ntp/metadata.json
-file path=etc/puppet/modules/ntp/spec/acceptance/class_spec.rb
-file path=etc/puppet/modules/ntp/spec/acceptance/disable_monitoring_spec.rb
-file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/centos-59-x64.yml
-file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64-pe.yml
-file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64.yml
-file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/centos-65-x64.yml
-file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/default.yml
-file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/fedora-18-x64.yml
-file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/fedora-21-x64.yml
-file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/sles-11-x64.yml
-file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/sles-12-64.yml
-file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
-file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
-file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
-file path=etc/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-14042-x64.yml
-file path=etc/puppet/modules/ntp/spec/acceptance/ntp_config_spec.rb
-file path=etc/puppet/modules/ntp/spec/acceptance/ntp_install_spec.rb
-file path=etc/puppet/modules/ntp/spec/acceptance/ntp_parameters_spec.rb
-file path=etc/puppet/modules/ntp/spec/acceptance/ntp_service_spec.rb
-file path=etc/puppet/modules/ntp/spec/acceptance/preferred_servers_spec.rb
-file path=etc/puppet/modules/ntp/spec/acceptance/restrict_spec.rb
-file path=etc/puppet/modules/ntp/spec/acceptance/unsupported_spec.rb
-file path=etc/puppet/modules/ntp/spec/classes/ntp_spec.rb
-file path=etc/puppet/modules/ntp/spec/spec.opts
-file path=etc/puppet/modules/ntp/spec/spec_helper.rb
-file path=etc/puppet/modules/ntp/spec/spec_helper_acceptance.rb
-file path=etc/puppet/modules/ntp/spec/unit/puppet/provider/README.markdown
-file path=etc/puppet/modules/ntp/spec/unit/puppet/type/README.markdown
-file path=etc/puppet/modules/ntp/templates/ntp.conf.erb
-file path=etc/puppet/modules/ntp/tests/init.pp
+file path=usr/puppetlabs/puppet/modules/ntp/CHANGELOG.md
+file path=usr/puppetlabs/puppet/modules/ntp/CONTRIBUTING.md
+file path=usr/puppetlabs/puppet/modules/ntp/Gemfile
+file path=usr/puppetlabs/puppet/modules/ntp/LICENSE
+file path=usr/puppetlabs/puppet/modules/ntp/README.markdown
+file path=usr/puppetlabs/puppet/modules/ntp/Rakefile
+file path=usr/puppetlabs/puppet/modules/ntp/checksums.json
+file path=usr/puppetlabs/puppet/modules/ntp/lib/puppet/parser/functions/ntp_dirname.rb
+file path=usr/puppetlabs/puppet/modules/ntp/manifests/config.pp
+file path=usr/puppetlabs/puppet/modules/ntp/manifests/init.pp
+file path=usr/puppetlabs/puppet/modules/ntp/manifests/install.pp
+file path=usr/puppetlabs/puppet/modules/ntp/manifests/params.pp
+file path=usr/puppetlabs/puppet/modules/ntp/manifests/service.pp
+file path=usr/puppetlabs/puppet/modules/ntp/metadata.json
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/class_spec.rb
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/disable_monitoring_spec.rb
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/nodesets/centos-59-x64.yml
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64-pe.yml
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64.yml
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/nodesets/centos-65-x64.yml
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/nodesets/default.yml
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/nodesets/fedora-18-x64.yml
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/nodesets/fedora-21-x64.yml
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/nodesets/sles-11-x64.yml
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/nodesets/sles-12-64.yml
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-14042-x64.yml
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/ntp_config_spec.rb
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/ntp_install_spec.rb
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/ntp_parameters_spec.rb
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/ntp_service_spec.rb
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/preferred_servers_spec.rb
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/restrict_spec.rb
+file path=usr/puppetlabs/puppet/modules/ntp/spec/acceptance/unsupported_spec.rb
+file path=usr/puppetlabs/puppet/modules/ntp/spec/classes/ntp_spec.rb
+file path=usr/puppetlabs/puppet/modules/ntp/spec/spec.opts
+file path=usr/puppetlabs/puppet/modules/ntp/spec/spec_helper.rb
+file path=usr/puppetlabs/puppet/modules/ntp/spec/spec_helper_acceptance.rb
+file path=usr/puppetlabs/puppet/modules/ntp/spec/unit/puppet/provider/README.markdown
+file path=usr/puppetlabs/puppet/modules/ntp/spec/unit/puppet/type/README.markdown
+file path=usr/puppetlabs/puppet/modules/ntp/templates/ntp.conf.erb
+file path=usr/puppetlabs/puppet/modules/ntp/tests/init.pp
 #
 license puppetlabs-ntp.license license="Apache v2.0"
 # Renamed Package
--- a/components/ruby/puppet-modules/puppetlabs-rabbitmq/puppetlabs-rabbitmq.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet-modules/puppetlabs-rabbitmq/puppetlabs-rabbitmq.p5m	Mon Nov 28 16:54:02 2016 -0800
@@ -23,8 +23,6 @@
 # Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
-<transform file dir -> default owner puppet>
-<transform file dir -> default group puppet>
 set name=pkg.fmri \
     value=pkg:/system/management/puppet/puppetlabs-rabbitmq@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Rabbitmq Puppet Module"
@@ -38,108 +36,109 @@
 set name=info.upstream \
     value="puppetlabs - https://forge.puppetlabs.com/puppetlabs"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2015/368 value=PSARC/2016/016
+set name=org.opensolaris.arc-caseid value=PSARC/2015/368 value=PSARC/2016/016 \
+    value=PSARC/2016/607
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file path=etc/puppet/modules/rabbitmq/CHANGELOG.md
-file path=etc/puppet/modules/rabbitmq/CONTRIBUTING.md
-file path=etc/puppet/modules/rabbitmq/Gemfile
-file path=etc/puppet/modules/rabbitmq/LICENSE
-file path=etc/puppet/modules/rabbitmq/README.md
-file path=etc/puppet/modules/rabbitmq/Rakefile
-file path=etc/puppet/modules/rabbitmq/TODO
-file path=etc/puppet/modules/rabbitmq/checksums.json
-file path=etc/puppet/modules/rabbitmq/files/README.markdown
-file path=etc/puppet/modules/rabbitmq/files/plugins/amqp_client-2.3.1.ez
-file path=etc/puppet/modules/rabbitmq/files/plugins/rabbit_stomp-2.3.1.ez
-file path=etc/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_binding/rabbitmqadmin.rb
-file path=etc/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_erlang_cookie/ruby.rb
-file path=etc/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb
-file path=etc/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_parameter/rabbitmqctl.rb
-file path=etc/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_plugin/rabbitmqplugins.rb
-file path=etc/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_policy/rabbitmqctl.rb
-file path=etc/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_queue/rabbitmqadmin.rb
-file path=etc/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_user/rabbitmqctl.rb
-file path=etc/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_user_permissions/rabbitmqctl.rb
-file path=etc/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_vhost/rabbitmqctl.rb
-file path=etc/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmqctl.rb
-file path=etc/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_binding.rb
-file path=etc/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_erlang_cookie.rb
-file path=etc/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_exchange.rb
-file path=etc/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_parameter.rb
-file path=etc/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_plugin.rb
-file path=etc/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_policy.rb
-file path=etc/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_queue.rb
-file path=etc/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_user.rb
-file path=etc/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_user_permissions.rb
-file path=etc/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_vhost.rb
-file path=etc/puppet/modules/rabbitmq/manifests/config.pp
-file path=etc/puppet/modules/rabbitmq/manifests/init.pp
-file path=etc/puppet/modules/rabbitmq/manifests/install.pp
-file path=etc/puppet/modules/rabbitmq/manifests/install/rabbitmqadmin.pp
-file path=etc/puppet/modules/rabbitmq/manifests/management.pp
-file path=etc/puppet/modules/rabbitmq/manifests/params.pp
-file path=etc/puppet/modules/rabbitmq/manifests/repo/apt.pp
-file path=etc/puppet/modules/rabbitmq/manifests/repo/rhel.pp
-file path=etc/puppet/modules/rabbitmq/manifests/server.pp
-file path=etc/puppet/modules/rabbitmq/manifests/service.pp
-file path=etc/puppet/modules/rabbitmq/metadata.json
-file path=etc/puppet/modules/rabbitmq/spec/README.markdown
-file path=etc/puppet/modules/rabbitmq/spec/acceptance/class_spec.rb
-file path=etc/puppet/modules/rabbitmq/spec/acceptance/clustering_spec.rb
-file path=etc/puppet/modules/rabbitmq/spec/acceptance/delete_guest_user_spec.rb
-file path=etc/puppet/modules/rabbitmq/spec/acceptance/nodesets/centos-59-x64.yml
-file path=etc/puppet/modules/rabbitmq/spec/acceptance/nodesets/centos-64-x64-pe.yml
-file path=etc/puppet/modules/rabbitmq/spec/acceptance/nodesets/centos-65-x64.yml
-file path=etc/puppet/modules/rabbitmq/spec/acceptance/nodesets/default.yml
-file path=etc/puppet/modules/rabbitmq/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
-file path=etc/puppet/modules/rabbitmq/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
-file path=etc/puppet/modules/rabbitmq/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
-file path=etc/puppet/modules/rabbitmq/spec/acceptance/policy_spec.rb
-file path=etc/puppet/modules/rabbitmq/spec/acceptance/queue_spec.rb
-file path=etc/puppet/modules/rabbitmq/spec/acceptance/rabbitmqadmin_spec.rb
-file path=etc/puppet/modules/rabbitmq/spec/acceptance/server_spec.rb
-file path=etc/puppet/modules/rabbitmq/spec/acceptance/user_spec.rb
-file path=etc/puppet/modules/rabbitmq/spec/acceptance/vhost_spec.rb
-file path=etc/puppet/modules/rabbitmq/spec/acceptance/zz281_spec.rb
-file path=etc/puppet/modules/rabbitmq/spec/classes/rabbitmq_spec.rb
-file path=etc/puppet/modules/rabbitmq/spec/spec.opts
-file path=etc/puppet/modules/rabbitmq/spec/spec_helper.rb
-file path=etc/puppet/modules/rabbitmq/spec/spec_helper_acceptance.rb
-file path=etc/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_binding/rabbitmqadmin_spec.rb
-file path=etc/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_exchange/rabbitmqadmin_spec.rb
-file path=etc/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_parameter/rabbitmqctl_spec.rb
-file path=etc/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_plugin/rabbitmqctl_spec.rb
-file path=etc/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_policy/rabbitmqctl_spec.rb
-file path=etc/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_queue/rabbitmqadmin_spec.rb
-file path=etc/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_user/rabbitmqctl_spec.rb
-file path=etc/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_user_permissions/rabbitmqctl_spec.rb
-file path=etc/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_vhost/rabbitmqctl_spec.rb
-file path=etc/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_binding_spec.rb
-file path=etc/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_exchange_spec.rb
-file path=etc/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_parameter_spec.rb
-file path=etc/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_policy_spec.rb
-file path=etc/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_queue_spec.rb
-file path=etc/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_user_permissions_spec.rb
-file path=etc/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_user_spec.rb
-file path=etc/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_vhost_spec.rb
-file path=etc/puppet/modules/rabbitmq/templates/README.markdown
-file path=etc/puppet/modules/rabbitmq/templates/default.erb
-file path=etc/puppet/modules/rabbitmq/templates/limits.conf
-file path=etc/puppet/modules/rabbitmq/templates/rabbitmq-env.conf.erb
-file path=etc/puppet/modules/rabbitmq/templates/rabbitmq-server.service.d/limits.conf
-file path=etc/puppet/modules/rabbitmq/templates/rabbitmq.config.erb
-file path=etc/puppet/modules/rabbitmq/templates/rabbitmqadmin.conf.erb
-file path=etc/puppet/modules/rabbitmq/tests/erlang_deps.pp
-file path=etc/puppet/modules/rabbitmq/tests/full.pp
-file path=etc/puppet/modules/rabbitmq/tests/permissions/add.pp
-file path=etc/puppet/modules/rabbitmq/tests/plugin.pp
-file path=etc/puppet/modules/rabbitmq/tests/repo/apt.pp
-file path=etc/puppet/modules/rabbitmq/tests/server.pp
-file path=etc/puppet/modules/rabbitmq/tests/service.pp
-file path=etc/puppet/modules/rabbitmq/tests/site.pp
-file path=etc/puppet/modules/rabbitmq/tests/user/add.pp
-file path=etc/puppet/modules/rabbitmq/tests/vhosts/add.pp
+file path=usr/puppetlabs/puppet/modules/rabbitmq/CHANGELOG.md
+file path=usr/puppetlabs/puppet/modules/rabbitmq/CONTRIBUTING.md
+file path=usr/puppetlabs/puppet/modules/rabbitmq/Gemfile
+file path=usr/puppetlabs/puppet/modules/rabbitmq/LICENSE
+file path=usr/puppetlabs/puppet/modules/rabbitmq/README.md
+file path=usr/puppetlabs/puppet/modules/rabbitmq/Rakefile
+file path=usr/puppetlabs/puppet/modules/rabbitmq/TODO
+file path=usr/puppetlabs/puppet/modules/rabbitmq/checksums.json
+file path=usr/puppetlabs/puppet/modules/rabbitmq/files/README.markdown
+file path=usr/puppetlabs/puppet/modules/rabbitmq/files/plugins/amqp_client-2.3.1.ez
+file path=usr/puppetlabs/puppet/modules/rabbitmq/files/plugins/rabbit_stomp-2.3.1.ez
+file path=usr/puppetlabs/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_binding/rabbitmqadmin.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_erlang_cookie/ruby.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_parameter/rabbitmqctl.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_plugin/rabbitmqplugins.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_policy/rabbitmqctl.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_queue/rabbitmqadmin.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_user/rabbitmqctl.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_user_permissions/rabbitmqctl.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_vhost/rabbitmqctl.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmqctl.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_binding.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_erlang_cookie.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_exchange.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_parameter.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_plugin.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_policy.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_queue.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_user.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_user_permissions.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_vhost.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/manifests/config.pp
+file path=usr/puppetlabs/puppet/modules/rabbitmq/manifests/init.pp
+file path=usr/puppetlabs/puppet/modules/rabbitmq/manifests/install.pp
+file path=usr/puppetlabs/puppet/modules/rabbitmq/manifests/install/rabbitmqadmin.pp
+file path=usr/puppetlabs/puppet/modules/rabbitmq/manifests/management.pp
+file path=usr/puppetlabs/puppet/modules/rabbitmq/manifests/params.pp
+file path=usr/puppetlabs/puppet/modules/rabbitmq/manifests/repo/apt.pp
+file path=usr/puppetlabs/puppet/modules/rabbitmq/manifests/repo/rhel.pp
+file path=usr/puppetlabs/puppet/modules/rabbitmq/manifests/server.pp
+file path=usr/puppetlabs/puppet/modules/rabbitmq/manifests/service.pp
+file path=usr/puppetlabs/puppet/modules/rabbitmq/metadata.json
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/README.markdown
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/acceptance/class_spec.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/acceptance/clustering_spec.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/acceptance/delete_guest_user_spec.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/acceptance/nodesets/centos-59-x64.yml
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/acceptance/nodesets/centos-64-x64-pe.yml
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/acceptance/nodesets/centos-65-x64.yml
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/acceptance/nodesets/default.yml
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/acceptance/policy_spec.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/acceptance/queue_spec.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/acceptance/rabbitmqadmin_spec.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/acceptance/server_spec.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/acceptance/user_spec.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/acceptance/vhost_spec.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/acceptance/zz281_spec.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/classes/rabbitmq_spec.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/spec.opts
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/spec_helper.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/spec_helper_acceptance.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_binding/rabbitmqadmin_spec.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_exchange/rabbitmqadmin_spec.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_parameter/rabbitmqctl_spec.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_plugin/rabbitmqctl_spec.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_policy/rabbitmqctl_spec.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_queue/rabbitmqadmin_spec.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_user/rabbitmqctl_spec.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_user_permissions/rabbitmqctl_spec.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_vhost/rabbitmqctl_spec.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_binding_spec.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_exchange_spec.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_parameter_spec.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_policy_spec.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_queue_spec.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_user_permissions_spec.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_user_spec.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_vhost_spec.rb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/templates/README.markdown
+file path=usr/puppetlabs/puppet/modules/rabbitmq/templates/default.erb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/templates/limits.conf
+file path=usr/puppetlabs/puppet/modules/rabbitmq/templates/rabbitmq-env.conf.erb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/templates/rabbitmq-server.service.d/limits.conf
+file path=usr/puppetlabs/puppet/modules/rabbitmq/templates/rabbitmq.config.erb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/templates/rabbitmqadmin.conf.erb
+file path=usr/puppetlabs/puppet/modules/rabbitmq/tests/erlang_deps.pp
+file path=usr/puppetlabs/puppet/modules/rabbitmq/tests/full.pp
+file path=usr/puppetlabs/puppet/modules/rabbitmq/tests/permissions/add.pp
+file path=usr/puppetlabs/puppet/modules/rabbitmq/tests/plugin.pp
+file path=usr/puppetlabs/puppet/modules/rabbitmq/tests/repo/apt.pp
+file path=usr/puppetlabs/puppet/modules/rabbitmq/tests/server.pp
+file path=usr/puppetlabs/puppet/modules/rabbitmq/tests/service.pp
+file path=usr/puppetlabs/puppet/modules/rabbitmq/tests/site.pp
+file path=usr/puppetlabs/puppet/modules/rabbitmq/tests/user/add.pp
+file path=usr/puppetlabs/puppet/modules/rabbitmq/tests/vhosts/add.pp
 #
 license puppetlabs-rabbitmq.license license="Apache v2.0"
 # Renamed Package
--- a/components/ruby/puppet-modules/puppetlabs-rsync/puppetlabs-rsync.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet-modules/puppetlabs-rsync/puppetlabs-rsync.p5m	Mon Nov 28 16:54:02 2016 -0800
@@ -23,8 +23,6 @@
 # Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
-<transform file dir -> default owner puppet>
-<transform file dir -> default group puppet>
 set name=pkg.fmri \
     value=pkg:/system/management/puppet/puppetlabs-rsync@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Rsync Puppet Module"
@@ -38,35 +36,36 @@
 set name=info.upstream \
     value="puppetlabs - https://forge.puppetlabs.com/puppetlabs"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2015/368 value=PSARC/2016/016
+set name=org.opensolaris.arc-caseid value=PSARC/2015/368 value=PSARC/2016/016 \
+    value=PSARC/2016/607
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file path=etc/puppet/modules/rsync/CHANGELOG.md
-file path=etc/puppet/modules/rsync/Gemfile
-file path=etc/puppet/modules/rsync/LICENSE
-file path=etc/puppet/modules/rsync/README.markdown
-file path=etc/puppet/modules/rsync/Rakefile
-file path=etc/puppet/modules/rsync/checksums.json
-file path=etc/puppet/modules/rsync/files/defaults
-file path=etc/puppet/modules/rsync/files/motd
-file path=etc/puppet/modules/rsync/manifests/get.pp
-file path=etc/puppet/modules/rsync/manifests/init.pp
-file path=etc/puppet/modules/rsync/manifests/put.pp
-file path=etc/puppet/modules/rsync/manifests/repo.pp
-file path=etc/puppet/modules/rsync/manifests/server.pp
-file path=etc/puppet/modules/rsync/manifests/server/module.pp
-file path=etc/puppet/modules/rsync/metadata.json
-file path=etc/puppet/modules/rsync/spec/classes/server_spec.rb
-file path=etc/puppet/modules/rsync/spec/defines/get_spec.rb
-file path=etc/puppet/modules/rsync/spec/defines/put_spec.rb
-file path=etc/puppet/modules/rsync/spec/defines/server_module_spec.rb
-file path=etc/puppet/modules/rsync/spec/spec.opts
-file path=etc/puppet/modules/rsync/spec/spec_helper.rb
-file path=etc/puppet/modules/rsync/templates/header.erb
-file path=etc/puppet/modules/rsync/templates/module.erb
-file path=etc/puppet/modules/rsync/tests/init.pp
-file path=etc/puppet/modules/rsync/tests/repo.pp
-file path=etc/puppet/modules/rsync/tests/server_with_motd.pp
+file path=usr/puppetlabs/puppet/modules/rsync/CHANGELOG.md
+file path=usr/puppetlabs/puppet/modules/rsync/Gemfile
+file path=usr/puppetlabs/puppet/modules/rsync/LICENSE
+file path=usr/puppetlabs/puppet/modules/rsync/README.markdown
+file path=usr/puppetlabs/puppet/modules/rsync/Rakefile
+file path=usr/puppetlabs/puppet/modules/rsync/checksums.json
+file path=usr/puppetlabs/puppet/modules/rsync/files/defaults
+file path=usr/puppetlabs/puppet/modules/rsync/files/motd
+file path=usr/puppetlabs/puppet/modules/rsync/manifests/get.pp
+file path=usr/puppetlabs/puppet/modules/rsync/manifests/init.pp
+file path=usr/puppetlabs/puppet/modules/rsync/manifests/put.pp
+file path=usr/puppetlabs/puppet/modules/rsync/manifests/repo.pp
+file path=usr/puppetlabs/puppet/modules/rsync/manifests/server.pp
+file path=usr/puppetlabs/puppet/modules/rsync/manifests/server/module.pp
+file path=usr/puppetlabs/puppet/modules/rsync/metadata.json
+file path=usr/puppetlabs/puppet/modules/rsync/spec/classes/server_spec.rb
+file path=usr/puppetlabs/puppet/modules/rsync/spec/defines/get_spec.rb
+file path=usr/puppetlabs/puppet/modules/rsync/spec/defines/put_spec.rb
+file path=usr/puppetlabs/puppet/modules/rsync/spec/defines/server_module_spec.rb
+file path=usr/puppetlabs/puppet/modules/rsync/spec/spec.opts
+file path=usr/puppetlabs/puppet/modules/rsync/spec/spec_helper.rb
+file path=usr/puppetlabs/puppet/modules/rsync/templates/header.erb
+file path=usr/puppetlabs/puppet/modules/rsync/templates/module.erb
+file path=usr/puppetlabs/puppet/modules/rsync/tests/init.pp
+file path=usr/puppetlabs/puppet/modules/rsync/tests/repo.pp
+file path=usr/puppetlabs/puppet/modules/rsync/tests/server_with_motd.pp
 #
 license LICENSE license="Apache v2.0"
 # Renamed Package
--- a/components/ruby/puppet-modules/puppetlabs-stdlib/puppetlabs-stdlib.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet-modules/puppetlabs-stdlib/puppetlabs-stdlib.p5m	Mon Nov 28 16:54:02 2016 -0800
@@ -23,8 +23,6 @@
 # Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
-<transform file dir -> default owner puppet>
-<transform file dir -> default group puppet>
 set name=pkg.fmri \
     value=pkg:/system/management/puppet/puppetlabs-stdlib@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Stdlib Puppet Module"
@@ -38,405 +36,406 @@
 set name=info.upstream \
     value="puppetlabs - https://forge.puppetlabs.com/puppetlabs"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2015/368 value=PSARC/2016/016
+set name=org.opensolaris.arc-caseid value=PSARC/2015/368 value=PSARC/2016/016 \
+    value=PSARC/2016/607
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file path=etc/puppet/modules/stdlib/CHANGELOG.md
-file path=etc/puppet/modules/stdlib/CONTRIBUTING.md
-file path=etc/puppet/modules/stdlib/Gemfile
-file path=etc/puppet/modules/stdlib/LICENSE
-file path=etc/puppet/modules/stdlib/README.markdown
-file path=etc/puppet/modules/stdlib/README_DEVELOPER.markdown
-file path=etc/puppet/modules/stdlib/README_SPECS.markdown
-file path=etc/puppet/modules/stdlib/RELEASE_PROCESS.markdown
-file path=etc/puppet/modules/stdlib/Rakefile
-file path=etc/puppet/modules/stdlib/checksums.json
-file path=etc/puppet/modules/stdlib/examples/file_line.pp
-file path=etc/puppet/modules/stdlib/examples/has_interface_with.pp
-file path=etc/puppet/modules/stdlib/examples/has_ip_address.pp
-file path=etc/puppet/modules/stdlib/examples/has_ip_network.pp
-file path=etc/puppet/modules/stdlib/examples/init.pp
-file path=etc/puppet/modules/stdlib/lib/facter/facter_dot_d.rb
-file path=etc/puppet/modules/stdlib/lib/facter/package_provider.rb
-file path=etc/puppet/modules/stdlib/lib/facter/pe_version.rb
-file path=etc/puppet/modules/stdlib/lib/facter/puppet_vardir.rb
-file path=etc/puppet/modules/stdlib/lib/facter/root_home.rb
-file path=etc/puppet/modules/stdlib/lib/facter/service_provider.rb
-file path=etc/puppet/modules/stdlib/lib/facter/util/puppet_settings.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/functions/is_a.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/functions/type_of.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/abs.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/any2array.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/assert_private.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/base64.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/basename.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/bool2num.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/bool2str.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/camelcase.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/capitalize.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/ceiling.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/chomp.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/chop.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/concat.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/convert_base.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/count.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/deep_merge.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/defined_with_params.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/delete.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/delete_at.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/delete_undef_values.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/delete_values.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/difference.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/dirname.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/dos2unix.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/downcase.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/empty.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/ensure_packages.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/ensure_resource.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/flatten.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/floor.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/fqdn_rand_string.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/fqdn_rotate.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/get_module_path.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/getparam.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/getvar.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/grep.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/has_interface_with.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/has_ip_address.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/has_ip_network.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/has_key.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/hash.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/intersection.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/is_absolute_path.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/is_array.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/is_bool.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/is_domain_name.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/is_float.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/is_function_available.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/is_hash.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/is_integer.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/is_ip_address.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/is_mac_address.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/is_numeric.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/is_string.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/join.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/join_keys_to_values.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/keys.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/load_module_metadata.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/loadyaml.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/lstrip.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/max.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/member.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/merge.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/min.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/num2bool.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/parsejson.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/parseyaml.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/pick.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/pick_default.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/prefix.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/private.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/pw_hash.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/range.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/reject.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/reverse.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/rstrip.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/seeded_rand.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/shuffle.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/size.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/sort.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/squeeze.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/str2bool.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/str2saltedsha512.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/strftime.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/strip.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/suffix.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/swapcase.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/time.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/to_bytes.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/try_get_value.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/type.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/type3x.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/union.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/unique.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/unix2dos.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/upcase.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/uriescape.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/validate_absolute_path.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/validate_array.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/validate_augeas.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/validate_bool.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/validate_cmd.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/validate_hash.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/validate_integer.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/validate_ip_address.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/validate_ipv4_address.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/validate_ipv6_address.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/validate_numeric.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/validate_re.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/validate_slength.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/validate_string.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/values.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/values_at.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/parser/functions/zip.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/provider/file_line/ruby.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/type/anchor.rb
-file path=etc/puppet/modules/stdlib/lib/puppet/type/file_line.rb
-file path=etc/puppet/modules/stdlib/manifests/init.pp
-file path=etc/puppet/modules/stdlib/manifests/stages.pp
-file path=etc/puppet/modules/stdlib/metadata.json
-file path=etc/puppet/modules/stdlib/spec/acceptance/abs_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/anchor_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/any2array_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/base64_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/bool2num_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/build_csv.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/capitalize_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/ceiling_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/chomp_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/chop_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/concat_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/count_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/deep_merge_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/defined_with_params_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/delete_at_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/delete_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/delete_undef_values_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/delete_values_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/difference_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/dirname_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/downcase_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/empty_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/ensure_resource_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/flatten_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/floor_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/fqdn_rand_string_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/fqdn_rotate_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/get_module_path_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/getparam_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/getvar_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/grep_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/has_interface_with_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/has_ip_address_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/has_ip_network_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/has_key_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/hash_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/intersection_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/is_a_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/is_array_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/is_bool_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/is_domain_name_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/is_float_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/is_function_available_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/is_hash_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/is_integer_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/is_ip_address_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/is_mac_address_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/is_numeric_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/is_string_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/join_keys_to_values_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/join_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/keys_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/loadyaml_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/lstrip_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/max_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/member_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/merge_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/min_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/nodesets/centos-59-x64.yml
-file path=etc/puppet/modules/stdlib/spec/acceptance/nodesets/centos-6-vcloud.yml
-file path=etc/puppet/modules/stdlib/spec/acceptance/nodesets/centos-64-x64-pe.yml
-file path=etc/puppet/modules/stdlib/spec/acceptance/nodesets/centos-64-x64.yml
-file path=etc/puppet/modules/stdlib/spec/acceptance/nodesets/centos-65-x64.yml
-file path=etc/puppet/modules/stdlib/spec/acceptance/nodesets/default.yml
-file path=etc/puppet/modules/stdlib/spec/acceptance/nodesets/fedora-18-x64.yml
-file path=etc/puppet/modules/stdlib/spec/acceptance/nodesets/sles-11-x64.yml
-file path=etc/puppet/modules/stdlib/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
-file path=etc/puppet/modules/stdlib/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
-file path=etc/puppet/modules/stdlib/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
-file path=etc/puppet/modules/stdlib/spec/acceptance/nodesets/windows-2003-i386.yml
-file path=etc/puppet/modules/stdlib/spec/acceptance/nodesets/windows-2003-x86_64.yml
-file path=etc/puppet/modules/stdlib/spec/acceptance/nodesets/windows-2008-x86_64.yml
-file path=etc/puppet/modules/stdlib/spec/acceptance/nodesets/windows-2008r2-x86_64.yml
-file path=etc/puppet/modules/stdlib/spec/acceptance/nodesets/windows-2012-x86_64.yml
-file path=etc/puppet/modules/stdlib/spec/acceptance/nodesets/windows-2012r2-x86_64.yml
-file path=etc/puppet/modules/stdlib/spec/acceptance/num2bool_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/parsejson_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/parseyaml_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/pick_default_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/pick_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/prefix_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/pw_hash_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/range_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/reject_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/reverse_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/rstrip_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/shuffle_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/size_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/sort_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/squeeze_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/str2bool_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/str2saltedsha512_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/strftime_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/strip_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/suffix_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/swapcase_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/time_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/to_bytes_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/try_get_value_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/type_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/union_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/unique_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/unsupported_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/upcase_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/uriescape_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/validate_absolute_path_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/validate_array_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/validate_augeas_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/validate_bool_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/validate_cmd_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/validate_hash_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/validate_ipv4_address_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/validate_ipv6_address_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/validate_re_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/validate_slength_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/validate_string_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/values_at_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/values_spec.rb
-file path=etc/puppet/modules/stdlib/spec/acceptance/zip_spec.rb
-file path=etc/puppet/modules/stdlib/spec/fixtures/dscacheutil/root
-file path=etc/puppet/modules/stdlib/spec/fixtures/lsuser/root
-file path=etc/puppet/modules/stdlib/spec/functions/abs_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/any2array_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/assert_private_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/base64_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/basename_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/bool2num_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/bool2str_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/camelcase_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/capitalize_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/ceiling_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/chomp_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/chop_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/concat_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/convert_base_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/count_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/deep_merge_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/defined_with_params_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/delete_at_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/delete_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/delete_undef_values_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/delete_values_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/difference_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/dirname_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/dos2unix_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/downcase_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/empty_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/ensure_packages_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/ensure_resource_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/flatten_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/floor_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/fqdn_rand_string_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/fqdn_rotate_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/get_module_path_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/getparam_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/getvar_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/grep_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/has_interface_with_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/has_ip_address_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/has_ip_network_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/has_key_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/hash_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/intersection_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/is_a_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/is_array_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/is_bool_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/is_domain_name_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/is_float_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/is_function_available.rb
-file path=etc/puppet/modules/stdlib/spec/functions/is_hash_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/is_integer_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/is_ip_address_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/is_mac_address_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/is_numeric_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/is_string_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/join_keys_to_values_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/join_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/keys_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/load_module_metadata_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/loadyaml_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/lstrip_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/max_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/member_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/merge_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/min_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/num2bool_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/parsejson_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/parseyaml_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/pick_default_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/pick_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/prefix_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/private_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/pw_hash_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/range_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/reject_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/reverse_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/rstrip_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/seeded_rand_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/shuffle_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/size_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/sort_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/squeeze_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/str2bool_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/str2saltedsha512_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/strftime_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/strip_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/suffix_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/swapcase_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/time_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/to_bytes_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/try_get_value_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/type3x_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/type_of_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/type_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/union_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/unique_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/unix2dos_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/upcase_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/uriescape_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/validate_absolute_path_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/validate_array_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/validate_augeas_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/validate_bool_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/validate_cmd_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/validate_hash_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/validate_integer_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/validate_ip_address_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/validate_ipv4_address_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/validate_ipv6_address_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/validate_numeric_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/validate_re_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/validate_slength_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/validate_string_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/values_at_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/values_spec.rb
-file path=etc/puppet/modules/stdlib/spec/functions/zip_spec.rb
-file path=etc/puppet/modules/stdlib/spec/monkey_patches/alias_should_to_must.rb
-file path=etc/puppet/modules/stdlib/spec/monkey_patches/publicize_methods.rb
-file path=etc/puppet/modules/stdlib/spec/puppetlabs_spec_helper_clone.rb
-file path=etc/puppet/modules/stdlib/spec/spec.opts
-file path=etc/puppet/modules/stdlib/spec/spec_helper.rb
-file path=etc/puppet/modules/stdlib/spec/spec_helper_acceptance.rb
-file path=etc/puppet/modules/stdlib/spec/unit/facter/facter_dot_d_spec.rb
-file path=etc/puppet/modules/stdlib/spec/unit/facter/package_provider_spec.rb
-file path=etc/puppet/modules/stdlib/spec/unit/facter/pe_version_spec.rb
-file path=etc/puppet/modules/stdlib/spec/unit/facter/root_home_spec.rb
-file path=etc/puppet/modules/stdlib/spec/unit/facter/service_provider_spec.rb
-file path=etc/puppet/modules/stdlib/spec/unit/facter/util/puppet_settings_spec.rb
-file path=etc/puppet/modules/stdlib/spec/unit/puppet/parser/functions/is_absolute_path_spec.rb
-file path=etc/puppet/modules/stdlib/spec/unit/puppet/provider/file_line/ruby_spec.rb
-file path=etc/puppet/modules/stdlib/spec/unit/puppet/type/anchor_spec.rb
-file path=etc/puppet/modules/stdlib/spec/unit/puppet/type/file_line_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/CHANGELOG.md
+file path=usr/puppetlabs/puppet/modules/stdlib/CONTRIBUTING.md
+file path=usr/puppetlabs/puppet/modules/stdlib/Gemfile
+file path=usr/puppetlabs/puppet/modules/stdlib/LICENSE
+file path=usr/puppetlabs/puppet/modules/stdlib/README.markdown
+file path=usr/puppetlabs/puppet/modules/stdlib/README_DEVELOPER.markdown
+file path=usr/puppetlabs/puppet/modules/stdlib/README_SPECS.markdown
+file path=usr/puppetlabs/puppet/modules/stdlib/RELEASE_PROCESS.markdown
+file path=usr/puppetlabs/puppet/modules/stdlib/Rakefile
+file path=usr/puppetlabs/puppet/modules/stdlib/checksums.json
+file path=usr/puppetlabs/puppet/modules/stdlib/examples/file_line.pp
+file path=usr/puppetlabs/puppet/modules/stdlib/examples/has_interface_with.pp
+file path=usr/puppetlabs/puppet/modules/stdlib/examples/has_ip_address.pp
+file path=usr/puppetlabs/puppet/modules/stdlib/examples/has_ip_network.pp
+file path=usr/puppetlabs/puppet/modules/stdlib/examples/init.pp
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/facter/facter_dot_d.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/facter/package_provider.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/facter/pe_version.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/facter/puppet_vardir.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/facter/root_home.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/facter/service_provider.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/facter/util/puppet_settings.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/functions/is_a.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/functions/type_of.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/abs.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/any2array.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/assert_private.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/base64.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/basename.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/bool2num.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/bool2str.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/camelcase.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/capitalize.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/ceiling.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/chomp.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/chop.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/concat.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/convert_base.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/count.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/deep_merge.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/defined_with_params.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/delete.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/delete_at.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/delete_undef_values.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/delete_values.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/difference.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/dirname.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/dos2unix.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/downcase.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/empty.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/ensure_packages.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/ensure_resource.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/flatten.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/floor.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/fqdn_rand_string.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/fqdn_rotate.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/get_module_path.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/getparam.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/getvar.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/grep.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/has_interface_with.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/has_ip_address.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/has_ip_network.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/has_key.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/hash.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/intersection.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/is_absolute_path.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/is_array.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/is_bool.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/is_domain_name.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/is_float.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/is_function_available.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/is_hash.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/is_integer.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/is_ip_address.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/is_mac_address.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/is_numeric.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/is_string.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/join.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/join_keys_to_values.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/keys.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/load_module_metadata.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/loadyaml.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/lstrip.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/max.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/member.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/merge.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/min.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/num2bool.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/parsejson.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/parseyaml.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/pick.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/pick_default.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/prefix.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/private.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/pw_hash.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/range.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/reject.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/reverse.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/rstrip.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/seeded_rand.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/shuffle.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/size.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/sort.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/squeeze.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/str2bool.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/str2saltedsha512.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/strftime.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/strip.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/suffix.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/swapcase.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/time.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/to_bytes.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/try_get_value.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/type.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/type3x.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/union.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/unique.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/unix2dos.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/upcase.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/uriescape.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/validate_absolute_path.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/validate_array.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/validate_augeas.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/validate_bool.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/validate_cmd.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/validate_hash.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/validate_integer.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/validate_ip_address.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/validate_ipv4_address.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/validate_ipv6_address.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/validate_numeric.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/validate_re.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/validate_slength.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/validate_string.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/values.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/values_at.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/parser/functions/zip.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/provider/file_line/ruby.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/type/anchor.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/lib/puppet/type/file_line.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/manifests/init.pp
+file path=usr/puppetlabs/puppet/modules/stdlib/manifests/stages.pp
+file path=usr/puppetlabs/puppet/modules/stdlib/metadata.json
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/abs_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/anchor_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/any2array_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/base64_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/bool2num_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/build_csv.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/capitalize_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/ceiling_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/chomp_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/chop_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/concat_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/count_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/deep_merge_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/defined_with_params_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/delete_at_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/delete_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/delete_undef_values_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/delete_values_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/difference_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/dirname_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/downcase_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/empty_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/ensure_resource_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/flatten_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/floor_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/fqdn_rand_string_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/fqdn_rotate_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/get_module_path_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/getparam_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/getvar_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/grep_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/has_interface_with_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/has_ip_address_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/has_ip_network_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/has_key_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/hash_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/intersection_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/is_a_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/is_array_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/is_bool_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/is_domain_name_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/is_float_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/is_function_available_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/is_hash_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/is_integer_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/is_ip_address_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/is_mac_address_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/is_numeric_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/is_string_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/join_keys_to_values_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/join_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/keys_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/loadyaml_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/lstrip_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/max_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/member_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/merge_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/min_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/nodesets/centos-59-x64.yml
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/nodesets/centos-6-vcloud.yml
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/nodesets/centos-64-x64-pe.yml
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/nodesets/centos-64-x64.yml
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/nodesets/centos-65-x64.yml
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/nodesets/default.yml
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/nodesets/fedora-18-x64.yml
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/nodesets/sles-11-x64.yml
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/nodesets/windows-2003-i386.yml
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/nodesets/windows-2003-x86_64.yml
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/nodesets/windows-2008-x86_64.yml
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/nodesets/windows-2008r2-x86_64.yml
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/nodesets/windows-2012-x86_64.yml
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/nodesets/windows-2012r2-x86_64.yml
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/num2bool_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/parsejson_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/parseyaml_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/pick_default_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/pick_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/prefix_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/pw_hash_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/range_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/reject_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/reverse_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/rstrip_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/shuffle_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/size_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/sort_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/squeeze_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/str2bool_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/str2saltedsha512_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/strftime_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/strip_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/suffix_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/swapcase_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/time_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/to_bytes_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/try_get_value_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/type_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/union_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/unique_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/unsupported_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/upcase_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/uriescape_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/validate_absolute_path_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/validate_array_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/validate_augeas_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/validate_bool_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/validate_cmd_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/validate_hash_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/validate_ipv4_address_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/validate_ipv6_address_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/validate_re_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/validate_slength_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/validate_string_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/values_at_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/values_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/acceptance/zip_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/fixtures/dscacheutil/root
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/fixtures/lsuser/root
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/abs_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/any2array_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/assert_private_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/base64_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/basename_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/bool2num_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/bool2str_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/camelcase_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/capitalize_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/ceiling_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/chomp_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/chop_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/concat_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/convert_base_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/count_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/deep_merge_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/defined_with_params_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/delete_at_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/delete_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/delete_undef_values_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/delete_values_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/difference_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/dirname_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/dos2unix_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/downcase_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/empty_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/ensure_packages_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/ensure_resource_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/flatten_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/floor_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/fqdn_rand_string_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/fqdn_rotate_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/get_module_path_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/getparam_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/getvar_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/grep_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/has_interface_with_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/has_ip_address_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/has_ip_network_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/has_key_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/hash_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/intersection_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/is_a_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/is_array_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/is_bool_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/is_domain_name_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/is_float_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/is_function_available.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/is_hash_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/is_integer_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/is_ip_address_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/is_mac_address_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/is_numeric_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/is_string_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/join_keys_to_values_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/join_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/keys_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/load_module_metadata_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/loadyaml_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/lstrip_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/max_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/member_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/merge_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/min_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/num2bool_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/parsejson_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/parseyaml_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/pick_default_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/pick_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/prefix_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/private_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/pw_hash_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/range_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/reject_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/reverse_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/rstrip_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/seeded_rand_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/shuffle_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/size_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/sort_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/squeeze_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/str2bool_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/str2saltedsha512_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/strftime_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/strip_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/suffix_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/swapcase_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/time_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/to_bytes_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/try_get_value_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/type3x_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/type_of_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/type_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/union_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/unique_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/unix2dos_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/upcase_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/uriescape_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/validate_absolute_path_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/validate_array_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/validate_augeas_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/validate_bool_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/validate_cmd_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/validate_hash_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/validate_integer_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/validate_ip_address_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/validate_ipv4_address_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/validate_ipv6_address_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/validate_numeric_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/validate_re_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/validate_slength_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/validate_string_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/values_at_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/values_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/functions/zip_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/monkey_patches/alias_should_to_must.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/monkey_patches/publicize_methods.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/puppetlabs_spec_helper_clone.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/spec.opts
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/spec_helper.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/spec_helper_acceptance.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/unit/facter/facter_dot_d_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/unit/facter/package_provider_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/unit/facter/pe_version_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/unit/facter/root_home_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/unit/facter/service_provider_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/unit/facter/util/puppet_settings_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/unit/puppet/parser/functions/is_absolute_path_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/unit/puppet/provider/file_line/ruby_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/unit/puppet/type/anchor_spec.rb
+file path=usr/puppetlabs/puppet/modules/stdlib/spec/unit/puppet/type/file_line_spec.rb
 #
 license LICENSE license="Apache v2.0"
 # Renamed Package
--- a/components/ruby/puppet-modules/saz-memcached/saz-memcached.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet-modules/saz-memcached/saz-memcached.p5m	Mon Nov 28 16:54:02 2016 -0800
@@ -23,8 +23,6 @@
 # Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
-<transform file dir -> default owner puppet>
-<transform file dir -> default group puppet>
 set name=pkg.fmri \
     value=pkg:/system/management/puppet/saz-memcached@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Memcached Puppet Module"
@@ -38,26 +36,27 @@
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream value="OpenStack <[email protected]>"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2015/368 value=PSARC/2016/016
+set name=org.opensolaris.arc-caseid value=PSARC/2015/368 value=PSARC/2016/016 \
+    value=PSARC/2016/607
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file path=etc/puppet/modules/memcached/Gemfile
-file path=etc/puppet/modules/memcached/LICENSE
-file path=etc/puppet/modules/memcached/README-DEVELOPER
-file path=etc/puppet/modules/memcached/README.md
-file path=etc/puppet/modules/memcached/Rakefile
-file path=etc/puppet/modules/memcached/checksums.json
-file path=etc/puppet/modules/memcached/lib/puppet/parser/functions/memcached_max_memory.rb
-file path=etc/puppet/modules/memcached/manifests/init.pp
-file path=etc/puppet/modules/memcached/manifests/params.pp
-file path=etc/puppet/modules/memcached/metadata.json
-file path=etc/puppet/modules/memcached/spec/classes/memcached_spec.rb
-file path=etc/puppet/modules/memcached/spec/spec.opts
-file path=etc/puppet/modules/memcached/spec/spec_helper.rb
-file path=etc/puppet/modules/memcached/templates/memcached.conf.erb
-file path=etc/puppet/modules/memcached/templates/memcached_sysconfig.erb
-file path=etc/puppet/modules/memcached/templates/memcached_windows.erb
-file path=etc/puppet/modules/memcached/tests/init.pp
+file path=usr/puppetlabs/puppet/modules/memcached/Gemfile
+file path=usr/puppetlabs/puppet/modules/memcached/LICENSE
+file path=usr/puppetlabs/puppet/modules/memcached/README-DEVELOPER
+file path=usr/puppetlabs/puppet/modules/memcached/README.md
+file path=usr/puppetlabs/puppet/modules/memcached/Rakefile
+file path=usr/puppetlabs/puppet/modules/memcached/checksums.json
+file path=usr/puppetlabs/puppet/modules/memcached/lib/puppet/parser/functions/memcached_max_memory.rb
+file path=usr/puppetlabs/puppet/modules/memcached/manifests/init.pp
+file path=usr/puppetlabs/puppet/modules/memcached/manifests/params.pp
+file path=usr/puppetlabs/puppet/modules/memcached/metadata.json
+file path=usr/puppetlabs/puppet/modules/memcached/spec/classes/memcached_spec.rb
+file path=usr/puppetlabs/puppet/modules/memcached/spec/spec.opts
+file path=usr/puppetlabs/puppet/modules/memcached/spec/spec_helper.rb
+file path=usr/puppetlabs/puppet/modules/memcached/templates/memcached.conf.erb
+file path=usr/puppetlabs/puppet/modules/memcached/templates/memcached_sysconfig.erb
+file path=usr/puppetlabs/puppet/modules/memcached/templates/memcached_windows.erb
+file path=usr/puppetlabs/puppet/modules/memcached/tests/init.pp
 #
 license saz-memcached.license license="Apache v2.0"
 # Renamed Package
--- a/components/ruby/puppet-solaris/Makefile	Wed Jan 11 15:24:27 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
-#
-include ../../../make-rules/shared-macros.mk
-RUBY_VERSION=2.1
-RUBY_LIB_VERSION=2.1.0
-RUBY_VERSIONS=2.1.0
-RUBY=/usr/ruby/$(RUBY_VERSION)/bin/ruby
-
-COMPONENT_NAME=		puppet-solaris
-COMPONENT_SRC=
-COMPONENT_VERSION=	$(PKG_SOLARIS_VERSION)
-COMPONENT_BUGDB=	utility/puppet
-
-include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/ruby.mk
-include $(WS_MAKE_RULES)/ips.mk
-
-
-# Not implemented by any make rules we are loading
-$(BUILD_64): ext/PuppetAudit.so $(BUILD_DIR)
-	$(MKDIR) $(dir $@)
-	$(TOUCH) $@
-
-# Not implemented by any make rules we are loading
-$(INSTALL_64): $(BUILD_64)
-	$(TOUCH) $@
-
-# common targets
-build: $(BUILD_64)
-
-INSTALL_DIR=$(BUILD_DIR)/prototype/$(MACH)
-SECURITY_FILES=$(addprefix files/,auth_attr exec_attr prof_attr)
-ETC_FILES=$(addprefix files/,user_attr)
-
-ext/PuppetAudit.so:
-	# Ruby extension for auditing
-	(cd ext; $(RUBY) extconf.rb; $(GMAKE))
-
-clean::
-	@if [ -f ext/Makefile ]; then \
-		(cd ext; $(GMAKE) clean; $(RM) Makefile) \
-	fi
-
-test:		$(NO_TESTS)
-
-system-test:    $(NO_TESTS)
-
-REQUIRED_PACKAGES += runtime/ruby-21
-REQUIRED_PACKAGES += shell/ksh93
-REQUIRED_PACKAGES += system/core-os
-REQUIRED_PACKAGES += system/library
-REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
-REQUIRED_PACKAGES += system/library/math
-REQUIRED_PACKAGES += system/network
--- a/components/ruby/puppet-solaris/ext/extconf.rb	Wed Jan 11 15:24:27 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-require 'mkmf'
-$CPPFLAGS = "-I/usr/include -I/usr/include/bsm"
-$LDFLAGS  = "-L/usr/lib"
-$LOCAL_LIBS = "-lbsm"
-create_makefile("PuppetAudit")
--- a/components/ruby/puppet-solaris/ext/puppet_audit.c	Wed Jan 11 15:24:27 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,169 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- */
-
-/*
- * Ruby binding for libbsm used by Puppet to record audit events
- */
-
-#include <ruby.h>
-#include <pwd.h>
-#include <nss_dbdefs.h>
-#include <bsm/adt.h>
-#include <bsm/adt_event.h>
-
-VALUE cPuppetAudit;
-
-VALUE
-audit_new(VALUE class)
-{
-	adt_session_data_t	*ah;
-	VALUE			data;
-
-	if (adt_start_session(&ah, NULL, 0) != 0) {
-		perror("puppet adt_start_session");
-		exit(1);
-	}
-	data = Data_Wrap_Struct(class, 0, 0, ah);
-	rb_obj_call_init(data, 0, 0);
-	return (data);
-}
-
-static VALUE
-audit_init(VALUE self)
-{
-	adt_session_data_t	*ah;
-	adt_termid_t		*tid;
-	struct passwd		pwd, *result;
-	char			*buffer;
-	size_t			size = NSS_BUFLEN_PASSWD;
-
-	Data_Get_Struct(self, adt_session_data_t, ah);
-
-	if (adt_load_hostname(NULL, &tid) != 0) {
-		perror("puppet adt_load_hostname");
-		(void) adt_end_session(ah);
-		exit(1);
-	}
-
-	if ((buffer = malloc(size)) == NULL)
-		exit(1);
-
-	/* set "puppet" as user name and preselection */
-	if (getpwnam_r("puppet", &pwd, buffer, size, &result) != 0) {
-		perror("puppet getpwnam_r(puppet)");
-		(void) adt_end_session(ah);
-		free(buffer);
-		exit(1);
-	}
-
-	if (result == NULL) {
-		perror("puppet getpwnam_r(puppet)");
-		(void) adt_end_session(ah);
-		free(buffer);
-		exit(1);
-	}
-
-	if (adt_set_user(ah, result->pw_uid, result->pw_gid, result->pw_uid,
-	    result->pw_gid, tid, ADT_NEW) != 0) {
-		perror("puppet adt_set_user");
-		free(tid);
-		(void) adt_end_session(ah);
-		free(buffer);
-		exit(1);
-	}
-	free(tid);
-
-	/* set audit context on this process */
-	if (adt_set_proc(ah) != 0) {
-		perror("puppet adt_set_proc");
-		(void) adt_end_session(ah);
-		free(buffer);
-		exit(1);
-	}
-	free(buffer);
-	return (self);
-}
-
-static VALUE
-audit_start(VALUE self)
-{
-	adt_event_data_t	*event;
-	adt_session_data_t	*ah;
-
-	Data_Get_Struct(self, adt_session_data_t, ah);
-
-	if ((event = adt_alloc_event(ah, ADT_puppet_session_start)) == NULL) {
-		perror("adt_alloc_event(ADT_puppet_session_start)");
-		(void) adt_end_session(ah);
-		ah = NULL;
-	} else {
-		if (adt_put_event(event, ADT_SUCCESS, ADT_SUCCESS) != 0) {
-			perror("adt_put_event(ADT_puppet_session_start)");
-		}
-		adt_free_event(event);
-	}
-	return (self);
-}
-
-static VALUE
-audit_stop(VALUE self)
-{
-	adt_event_data_t	*event;
-	adt_session_data_t	*ah;
-
-	Data_Get_Struct(self, adt_session_data_t, ah);
-
-	if ((event = adt_alloc_event(ah, ADT_puppet_session_end)) == NULL) {
-		perror("adt_alloc_event(ADT_puppet_session_end)");
-	} else {
-		if (adt_put_event(event, ADT_SUCCESS, ADT_SUCCESS) != 0) {
-			perror("adt_put_event(ADT_puppet_session_end)");
-		}
-		adt_free_event(event);
-	}
-	return (self);
-}
-
-static VALUE
-audit_teardown(VALUE self)
-{
-	adt_session_data_t	*ah;
-
-	Data_Get_Struct(self, adt_session_data_t, ah);
-
-	(void) adt_end_session(ah);
-	return (self);
-}
-
-void
-Init_PuppetAudit()
-{
-	cPuppetAudit = rb_define_class("PuppetAudit", rb_cObject);
-	rb_define_singleton_method(cPuppetAudit, "new", audit_new, 0);
-	rb_define_method(cPuppetAudit, "initialize", audit_init, 0);
-	rb_define_method(cPuppetAudit, "audit_start", audit_start, 0);
-	rb_define_method(cPuppetAudit, "audit_stop", audit_stop, 0);
-	rb_define_method(cPuppetAudit, "audit_teardown", audit_teardown, 0);
-}
--- a/components/ruby/puppet-solaris/files/auth_attr	Wed Jan 11 15:24:27 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-solaris.smf.manage.puppet:RO::Manage puppet master states::
-solaris.smf.value.puppet:RO::Change puppet master properties::
--- a/components/ruby/puppet-solaris/files/exec_attr	Wed Jan 11 15:24:27 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Puppet Management:solaris:cmd:RO::/usr/sbin/puppet:uid=0
--- a/components/ruby/puppet-solaris/files/prof_attr	Wed Jan 11 15:24:27 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Puppet Management:RO::Manage the puppet master service:auths=solaris.smf.manage.puppet,solaris.smf.value.puppet
--- a/components/ruby/puppet-solaris/files/puppet.logadm.conf	Wed Jan 11 15:24:27 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
-#
-# Entries to be added to /etc/logadm.conf by svc:/system/logadm-upgrade
-#
-/var/lib/puppet/log/masterhttp.log -C 7 -S 20m -c -z 5 -N
--- a/components/ruby/puppet-solaris/files/puppet.stencil	Wed Jan 11 15:24:27 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-# WARNING: THIS FILE GENERATED FROM SMF DATA.
-#     DO NOT EDIT THIS FILE.  EDITS WILL BE LOST.
-#
-# See puppet.conf(5) and http://docs.puppetlabs.com/guides/configuring.html
-# for details.
-; walk each instance and extract all properties from the config PG
-$%/(svc:/$%s:(.*)/:properties)/ {
-$%{$%1/general/enabled:?
-[$%2]
-$%/$%1/config/(.*)/ {
-$%3 = $%{$%1/config/$%3} }
-}
-}
--- a/components/ruby/puppet-solaris/files/puppet.xml	Wed Jan 11 15:24:27 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2352 +0,0 @@
-<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<!--
- CDDL HEADER START
-
- The contents of this file are subject to the terms of the
- Common Development and Distribution License (the "License").
- You may not use this file except in compliance with the License.
-
- You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- or http://www.opensolaris.org/os/licensing.
- See the License for the specific language governing permissions
- and limitations under the License.
-
- When distributing Covered Code, include this CDDL HEADER in each
- file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- If applicable, add the following below this CDDL HEADER, with the
- fields enclosed by brackets "[]" replaced with your own identifying
- information: Portions Copyright [yyyy] [name of copyright owner]
-
- CDDL HEADER END
-
- Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
-
- NOTE:  This service manifest is not editable; its contents will
- be overwritten by package or patch operations, including
- operating system upgrade.  Make customizations in a different
- file.
--->
-<service_bundle type="manifest" name="puppet">
-  <service name="application/puppet" type="service" version="1">
-    <dependency name="filesystem" grouping="require_all" restart_on="error" type="service">
-      <service_fmri value="svc:/system/filesystem/minimal"/>
-    </dependency>
-    <dependency name="network" grouping="require_all" restart_on="error" type="service">
-      <service_fmri value="svc:/milestone/network"/>
-    </dependency>
-    <dependency name="identity" grouping="require_all" restart_on="error" type="service">
-      <service_fmri value="svc:/system/identity:node"/>
-    </dependency>
-    <exec_method type="method" name="start" exec=":true" timeout_seconds="60"/>
-    <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60"/>
-    <exec_method type="method" name="refresh" exec=":true" timeout_seconds="0"/>
-    <property_group name="general" type="framework">
-      <!-- to start stop puppet -->
-      <propval name="action_authorization" type="astring" value="solaris.smf.manage.puppet"/>
-      <!-- to change puppet properties -->
-      <propval name="value_authorization" type="astring" value="solaris.smf.value.puppet"/>
-    </property_group>
-    <property_group name="puppet_stencil" type="configfile">
-      <propval name="path" type="astring" value="/etc/puppet/puppet.conf"/>
-      <propval name="stencil" type="astring" value="puppet.stencil"/>
-      <propval name="mode" type="astring" value="0444"/>
-    </property_group>
-    <instance name="master" enabled="false">
-      <exec_method type="method" name="start" exec="/usr/sbin/puppet master --logdest %{config/logdest}" timeout_seconds="600"/>
-      <property_group name="config" type="application">
-        <propval name="logdest" type="astring" value="/var/log/puppet/puppet-master.log"/>
-      </property_group>
-    </instance>
-    <instance name="agent" enabled="false">
-      <exec_method type="method" name="start" exec="/usr/sbin/puppet agent --logdest %{config/logdest}" timeout_seconds="600"/>
-      <property_group name="config" type="application">
-        <propval name="logdest" type="astring" value="/var/log/puppet/puppet-agent.log"/>
-      </property_group>
-    </instance>
-    <stability value="Unstable"/>
-    <template>
-      <common_name>
-        <loctext xml:lang="C">Puppet version 3.8.6</loctext>
-      </common_name>
-      <documentation>
-        <manpage title="puppet-master" section="8" manpath="/usr/share/man"/>
-      </documentation>
-      <pg_pattern required="false" type="application" name="config">
-        <prop_pattern required="false" type="astring" name="agent_catalog_run_lockfile">
-          <description>
-            <loctext xml:lang="C">
-A lock file to indicate that a puppet agent catalog run is currently in progress.
-The file contains the pid of the process that holds the lock on the catalog run.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="agent_disabled_lockfile">
-          <description>
-            <loctext xml:lang="C">
-A lock file to indicate that puppet agent runs have been administratively
-disabled.  File contains a JSON object with state information.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="allow_duplicate_certs">
-          <description>
-            <loctext xml:lang="C">
-Whether to allow a new certificate
-request to overwrite an existing certificate.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="allow_variables_with_dashes">
-          <description>
-            <loctext xml:lang="C">
-Permit hyphens (`-`) in variable names and issue deprecation warnings about
-them. This setting **should always be `false`;** setting it to `true`
-will cause subtle and wide-ranging bugs. It will be removed in a future version.
-
-Hyphenated variables caused major problems in the language, but were allowed
-between Puppet 2.7.3 and 2.7.14. If you used them during this window, we
-apologize for the inconvenience --- you can temporarily set this to `true`
-in order to upgrade, and can rename your variables at your leisure. Please
-revert it to `false` after you have renamed all affected variables.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="always_cache_features">
-          <description>
-            <loctext xml:lang="C">
-Affects how we cache attempts to load Puppet 'features'.  If false, then
-calls to `Puppet.features.&lt;feature&gt;?` will always attempt to load the
-feature (which can be an expensive operation) unless it has already been
-loaded successfully.  This makes it possible for a single agent run to,
-e.g., install a package that provides the underlying capabilities for
-a feature, and then later load that feature during the same run (even if
-the feature had been tested earlier and had not been available).
-
-If this setting is set to true, then features will only be checked once,
-and if they are not available, the negative result is cached and returned
-for all subsequent attempts to load the feature.  This behavior is almost
-always appropriate for the server, and can result in a significant performance
-improvement for features that are checked frequently.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="host" name="archive_file_server">
-          <description>
-            <loctext xml:lang="C">
-During an inspect run, the file bucket server to archive files to if archive_files is set.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="archive_files">
-          <description>
-            <loctext xml:lang="C">
-During an inspect run, whether to archive files whose contents are audited to a file bucket.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="async_storeconfigs">
-          <description>
-            <loctext xml:lang="C">
-Whether to use a queueing system to provide asynchronous database integration.
-Requires that `puppet queue` be running.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="autoflush">
-          <description>
-            <loctext xml:lang="C">
-Whether log files should always flush to disk.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="autosign">
-          <description>
-            <loctext xml:lang="C">
-Whether (and how) to autosign certificate requests. This setting
-is only relevant on a puppet master acting as a certificate authority (CA).
-
-Valid values are true (autosigns all certificate requests; not recommended),
-false (disables autosigning certificates), or the absolute path to a file.
-
-The file specified in this setting may be either a **configuration file**
-or a **custom policy executable.** Puppet will automatically determine
-what it is: If the Puppet user (see the `user` setting) can execute the
-file, it will be treated as a policy executable; otherwise, it will be
-treated as a config file.
-
-If a custom policy executable is configured, the CA puppet master will run it
-every time it receives a CSR. The executable will be passed the subject CN of the
-request _as a command line argument,_ and the contents of the CSR in PEM format
-_on stdin._ It should exit with a status of 0 if the cert should be autosigned
-and non-zero if the cert should not be autosigned.
-
-If a certificate request is not autosigned, it will persist for review. An admin
-user can use the `puppet cert sign` command to manually sign it, or can delete
-the request.
-
-For info on autosign configuration files, see
-[the guide to Puppet's config files](http://docs.puppetlabs.com/guides/configuring.html).
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="basemodulepath">
-          <description>
-            <loctext xml:lang="C">
-The search path for **global** modules. Should be specified as a
-list of directories separated by the system path separator character. (The
-POSIX path separator is ':', and the Windows path separator is ';'.)
-
-If you are using directory environments, these are the modules that will
-be used by _all_ environments. Note that the `modules` directory of the active
-environment will have priority over any global directories. For more info, see
-http://docs.puppetlabs.com/puppet/latest/reference/environments.html
-
-This setting also provides the default value for the deprecated `modulepath`
-setting, which is used when directory environments are disabled.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="net_address" name="bindaddress">
-          <description>
-            <loctext xml:lang="C">
-The address a listening server should bind to.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="binder">
-          <description>
-            <loctext xml:lang="C">
-Turns the binding system on or off. This includes bindings in modules.
-The binding system aggregates data from modules and other locations and makes them available for lookup.
-The binding system is experimental and any or all of it may change.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="binder_config">
-          <description>
-            <loctext xml:lang="C">
-The binder configuration file. Puppet reads this file on each request to configure the bindings system.
-If set to nil (the default), a $confdir/binder_config.yaml is optionally loaded. If it does not exists, a default configuration
-is used. If the setting :binding_config is specified, it must reference a valid and existing yaml file.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="bucketdir">
-          <description>
-            <loctext xml:lang="C">
-Where FileBucket files are stored.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="ca">
-          <description>
-            <loctext xml:lang="C">
-Whether the master should function as a certificate authority.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="ca_name">
-          <description>
-            <loctext xml:lang="C">
-The name to use the Certificate Authority certificate.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="integer" name="ca_port">
-          <description>
-            <loctext xml:lang="C">
-The port to use for the certificate authority.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="host" name="ca_server">
-          <description>
-            <loctext xml:lang="C">
-The server to use for certificate
-authority requests.  It's a separate server because it cannot
-and does not need to horizontally scale.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="integer" name="ca_ttl">
-          <description>
-            <loctext xml:lang="C">
-The default TTL for new certificates.
-This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y).
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="cacert">
-          <description>
-            <loctext xml:lang="C">
-The CA certificate.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="cacrl">
-          <description>
-            <loctext xml:lang="C">
-The certificate revocation list (CRL) for the CA. Will be used if present but otherwise ignored.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="cadir">
-          <description>
-            <loctext xml:lang="C">
-The root directory for the certificate authority.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="cakey">
-          <description>
-            <loctext xml:lang="C">
-The CA private key.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="capass">
-          <description>
-            <loctext xml:lang="C">
-Where the CA stores the password for the private key.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="caprivatedir">
-          <description>
-            <loctext xml:lang="C">
-Where the CA stores private certificate information.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="capub">
-          <description>
-            <loctext xml:lang="C">
-The CA public key.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="catalog_cache_terminus">
-          <description>
-            <loctext xml:lang="C">
-How to store cached catalogs. Valid values are 'json', 'msgpack' and 'yaml'. The agent application defaults to 'json'.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="catalog_format">
-          <description>
-            <loctext xml:lang="C">
-(Deprecated for 'preferred_serialization_format') What format to
-use to dump the catalog.  Only supports 'marshal' and 'yaml'.  Only
-matters on the client, since it asks the server for a specific format.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="catalog_terminus">
-          <description>
-            <loctext xml:lang="C">
-Where to get node catalogs.  This is useful to change if, for instance,
-you'd like to pre-compile catalogs and store them in memcached or some other easily-accessed store.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="cert_inventory">
-          <description>
-            <loctext xml:lang="C">
-The inventory file. This is a text file to which the CA writes a
-complete listing of all certificates.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="certdir">
-          <description>
-            <loctext xml:lang="C">
-The certificate directory.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="certdnsnames">
-          <description>
-            <loctext xml:lang="C">
-The `certdnsnames` setting is no longer functional,
-after CVE-2011-3872. We ignore the value completely.
-
-For your own certificate request you can set `dns_alt_names` in the
-configuration and it will apply locally.  There is no configuration option to
-set DNS alt names, or any other `subjectAltName` value, for another nodes
-certificate.
-
-Alternately you can use the `--dns_alt_names` command line option to set the
-labels added while generating your own CSR.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="integer" name="certificate_expire_warning">
-          <description>
-            <loctext xml:lang="C">
-The window of time leading up to a certificate's expiration that a notification
-will be logged. This applies to CA, master, and agent certificates. This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y).
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="certificate_revocation">
-          <description>
-            <loctext xml:lang="C">
-Whether certificate revocation should be supported by downloading a
-Certificate Revocation List (CRL)
-to all clients.  If enabled, CA chaining will almost definitely not work.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="hostname" name="certname">
-          <description>
-            <loctext xml:lang="C">
-The name to use when handling certificates. When a node
-requests a certificate from the CA puppet master, it uses the value of the
-`certname` setting as its requested Subject CN.
-
-This is the name used when managing a node's permissions in
-[auth.conf](http://docs.puppetlabs.com/puppet/latest/reference/config_file_auth.html).
-In most cases, it is also used as the node's name when matching
-[node definitions](http://docs.puppetlabs.com/puppet/latest/reference/lang_node_definitions.html)
-and requesting data from an ENC. (This can be changed with the `node_name_value`
-and `node_name_fact` settings, although you should only do so if you have
-a compelling reason.)
-
-A node's certname is available in Puppet manifests as `$trusted['certname']`. (See
-[Facts and Built-In Variables](http://docs.puppetlabs.com/puppet/latest/reference/lang_facts_and_builtin_vars.html)
-for more details.)
-
-* For best compatibility, you should limit the value of `certname` to
-  only use letters, numbers, periods, underscores, and dashes. (That is,
-  it should match `/A[a-z0-9._-]+Z/`.)
-* The special value `ca` is reserved, and can't be used as the certname
-  for a normal node.
-
-Defaults to the node's fully qualified domain name.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="cfacter">
-          <description>
-            <loctext xml:lang="C">
-Whether or not to use the native facter (cfacter) implementation instead of the Ruby one (facter). Defaults to false.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="classfile">
-          <description>
-            <loctext xml:lang="C">
-The file in which puppet agent stores a list of the classes
-associated with the retrieved configuration.  Can be loaded in
-the separate `puppet` executable using the `--loadclasses`
-option.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="client_datadir">
-          <description>
-            <loctext xml:lang="C">
-The directory in which serialized data is stored on the client.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="clientbucketdir">
-          <description>
-            <loctext xml:lang="C">
-Where FileBucket files are stored locally.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="clientyamldir">
-          <description>
-            <loctext xml:lang="C">
-The directory in which client-side YAML data is stored.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="code">
-          <description>
-            <loctext xml:lang="C">
-Code to parse directly.  This is essentially only used
-by `puppet`, and should only be set if you're writing your own Puppet
-executable.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="color">
-          <description>
-            <loctext xml:lang="C">
-Whether to use colors when logging to the console.  Valid values are
-`ansi` (equivalent to `true`), `html`, and `false`, which produces no color.
-Defaults to false on Windows, as its console does not support ansi colors.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="confdir">
-          <description>
-            <loctext xml:lang="C">
-The main Puppet configuration directory.  The default for this setting
-is calculated based on the user.  If the process is running as root or
-the user that Puppet is supposed to run as, it defaults to a system
-directory, but if it's running as any other user, it defaults to being
-in the user's home directory.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="config">
-          <description>
-            <loctext xml:lang="C">
-The configuration file for the current puppet application.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="config_file_name">
-          <description>
-            <loctext xml:lang="C">
-The name of the puppet config file.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="config_version">
-          <description>
-            <loctext xml:lang="C">
-How to determine the configuration version.  By default, it will be the
-time that the configuration is parsed, but you can provide a shell script to override how the
-version is determined.  The output of this script will be added to every log message in the
-reports, allowing you to correlate changes on your hosts to the source version on the server.
-
-Setting a global value for config_version in puppet.conf is deprecated. Please set a
-per-environment value in environment.conf instead. For more info, see
-http://docs.puppetlabs.com/puppet/latest/reference/environments.html
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="configprint">
-          <description>
-            <loctext xml:lang="C">
-Print the value of a specific configuration setting.  If the name of a
-setting is provided for this, then the value is printed and puppet
-exits.  Comma-separate multiple values.  For a list of all values,
-specify 'all'.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="integer" name="configtimeout">
-          <description>
-            <loctext xml:lang="C">
-How long the client should wait for the configuration to be retrieved
-before considering it a failure.  This can help reduce flapping if too
-many clients contact the server at one time. This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y).
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="uri" name="couchdb_url">
-          <description>
-            <loctext xml:lang="C">
-The url where the puppet couchdb database will be created.
-Only used when `facts_terminus` is set to `couch`.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="csr_attributes">
-          <description>
-            <loctext xml:lang="C">
-An optional file containing custom attributes to add to certificate signing
-requests (CSRs). You should ensure that this file does not exist on your CA
-puppet master; if it does, unwanted certificate extensions may leak into
-certificates created with the `puppet cert generate` command.
-
-If present, this file must be a YAML hash containing a `custom_attributes` key
-and/or an `extension_requests` key. The value of each key must be a hash, where
-each key is a valid OID and each value is an object that can be cast to a string.
-
-Custom attributes can be used by the CA when deciding whether to sign the
-certificate, but are then discarded. Attribute OIDs can be any OID value except
-the standard CSR attributes (i.e. attributes described in RFC 2985 section 5.4).
-This is useful for embedding a pre-shared key for autosigning policy executables
-(see the `autosign` setting), often by using the `1.2.840.113549.1.9.7`
-("challenge password") OID.
-
-Extension requests will be permanently embedded in the final certificate.
-Extension OIDs must be in the "ppRegCertExt" (`1.3.6.1.4.1.34380.1.1`) or
-"ppPrivCertExt" (`1.3.6.1.4.1.34380.1.2`) OID arcs. The ppRegCertExt arc is
-reserved for four of the most common pieces of data to embed: `pp_uuid` (`.1`),
-`pp_instance_id` (`.2`), `pp_image_name` (`.3`), and `pp_preshared_key` (`.4`)
---- in the YAML file, these can be referred to by their short descriptive names
-instead of their full OID. The ppPrivCertExt arc is unregulated, and can be used
-for site-specific extensions.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="csrdir">
-          <description>
-            <loctext xml:lang="C">
-Where the CA stores certificate requests
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="daemonize">
-          <description>
-            <loctext xml:lang="C">
-Whether to send the process into the background.  This defaults
-to true on POSIX systems, and to false on Windows (where Puppet
-currently cannot daemonize).
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="data_binding_terminus">
-          <description>
-            <loctext xml:lang="C">
-Where to retrive information about data.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="dbadapter">
-          <description>
-            <loctext xml:lang="C">
-The type of database to use. This setting is only used by the ActiveRecord storeconfigs and inventory backends, which are deprecated.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="dbconnections">
-          <description>
-            <loctext xml:lang="C">
-The number of database connections for networked
-databases.  Will be ignored unless the value is a positive integer. This setting is only used by the ActiveRecord storeconfigs and inventory backends, which are deprecated.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="dblocation">
-          <description>
-            <loctext xml:lang="C">
-The sqlite database file. This setting is only used by the ActiveRecord storeconfigs and inventory backends, which are deprecated.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="dbmigrate">
-          <description>
-            <loctext xml:lang="C">
-Whether to automatically migrate the database. This setting is only used by the ActiveRecord storeconfigs and inventory backends, which are deprecated.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="dbname">
-          <description>
-            <loctext xml:lang="C">
-The name of the database to use. This setting is only used by the ActiveRecord storeconfigs and inventory backends, which are deprecated.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="dbpassword">
-          <description>
-            <loctext xml:lang="C">
-The database password for caching. Only
-used when networked databases are used. This setting is only used by the ActiveRecord storeconfigs and inventory backends, which are deprecated.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="dbport">
-          <description>
-            <loctext xml:lang="C">
-The database password for caching. Only
-used when networked databases are used. This setting is only used by the ActiveRecord storeconfigs and inventory backends, which are deprecated.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="host" name="dbserver">
-          <description>
-            <loctext xml:lang="C">
-The database server for caching. Only
-used when networked databases are used.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="dbsocket">
-          <description>
-            <loctext xml:lang="C">
-The database socket location. Only used when networked
-databases are used.  Will be ignored if the value is an empty string. This setting is only used by the ActiveRecord storeconfigs and inventory backends, which are deprecated.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="dbuser">
-          <description>
-            <loctext xml:lang="C">
-The database user for caching. Only
-used when networked databases are used. This setting is only used by the ActiveRecord storeconfigs and inventory backends, which are deprecated.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="default_file_terminus">
-          <description>
-            <loctext xml:lang="C">
-The default source for files if no server is given in a
-uri, e.g. puppet:///file. The default of `rest` causes the file to be
-retrieved using the `server` setting. When running `apply` the default
-is `file_server`, causing requests to be filled locally.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="default_manifest">
-          <description>
-            <loctext xml:lang="C">
-The default main manifest for directory environments. Any environment that
-doesn't set the `manifest` setting in its `environment.conf` file will use
-this manifest.
-
-This setting's value can be an absolute or relative path. An absolute path
-will make all environments default to the same main manifest; a relative
-path will allow each environment to use its own manifest, and Puppet will
-resolve the path relative to each environment's main directory.
-
-In either case, the path can point to a single file or to a directory of
-manifests to be evaluated in alphabetical order.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="default_schedules">
-          <description>
-            <loctext xml:lang="C">
-Boolean; whether to generate the default schedule resources. Setting this to
-false is useful for keeping external report processors clean of skipped schedule resources.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="deviceconfig">
-          <description>
-            <loctext xml:lang="C">
-Path to the device config file for puppet device.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="devicedir">
-          <description>
-            <loctext xml:lang="C">
-The root directory of devices' $vardir.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="diff">
-          <description>
-            <loctext xml:lang="C">
-Which diff command to use when printing differences between files. This setting
-has no default value on Windows, as standard `diff` is not available, but Puppet can use many
-third-party diff tools.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="diff_args">
-          <description>
-            <loctext xml:lang="C">
-Which arguments to pass to the diff command when printing differences between
-files. The command to use can be chosen with the `diff` setting.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="digest_algorithm">
-          <description>
-            <loctext xml:lang="C">
-Which digest algorithm to use for file resources and the filebucket.
-Valid values are md5, sha256. Default is md5.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="disable_per_environment_manifest">
-          <description>
-            <loctext xml:lang="C">
-Whether to disallow an environment-specific main manifest. When set
-to `true`, Puppet will use the manifest specified in the `default_manifest` setting
-for all environments. If an environment specifies a different main manifest in its
-`environment.conf` file, catalog requests for that environment will fail with an error.
-
-This setting requires `default_manifest` to be set to an absolute path.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="disable_warnings">
-          <description>
-            <loctext xml:lang="C">
-A comma-separated list of warning types to suppress. If large numbers
-of warnings are making Puppet's logs too large or difficult to use, you
-can temporarily silence them with this setting.
-
-If you are preparing to upgrade Puppet to a new major version, you
-should re-enable all warnings for a while.
-
-Valid values for this setting are:
-
-* `deprecations` --- disables deprecation warnings.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="host" name="dns_alt_names">
-          <description>
-            <loctext xml:lang="C">
-The comma-separated list of alternative DNS names to use for the local host.
-
-When the node generates a CSR for itself, these are added to the request
-as the desired `subjectAltName` in the certificate: additional DNS labels
-that the certificate is also valid answering as.
-
-This is generally required if you use a non-hostname `certname`, or if you
-want to use `puppet kick` or `puppet resource -H` and the primary certname
-does not match the DNS name you use to communicate with the host.
-
-This is unnecessary for agents, unless you intend to use them as a server for
-`puppet kick` or remote `puppet resource` management.
-
-It is rarely necessary for servers; it is usually helpful only if you need to
-have a pool of multiple load balanced masters, or for the same master to
-respond on two physically separate networks under different names.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="document_all">
-          <description>
-            <loctext xml:lang="C">
-Whether to document all resources when using `puppet doc` to
-generate manifest documentation.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="dynamicfacts">
-          <description>
-            <loctext xml:lang="C">
-(Deprecated) Facts that are dynamic; these facts will be ignored when deciding whether
-changed facts should result in a recompile.  Multiple facts should be
-comma-separated.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="environment">
-          <description>
-            <loctext xml:lang="C">
-The environment Puppet is running in.  For clients
-(e.g., `puppet agent`) this determines the environment itself, which
-is used to find modules and much more.  For servers (i.e., `puppet master`)
-this provides the default environment for nodes we know nothing about.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="integer" name="environment_timeout">
-          <description>
-            <loctext xml:lang="C">
-How long the Puppet master should cache data it loads from an
-environment.
-This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y).
-A value of `0` will disable caching. This setting can also be set to
-`unlimited`, which will cache environments until the master is restarted
-or told to refresh the cache.
-
-You should change this setting once your Puppet deployment is doing
-non-trivial work. We chose the default value of `0` because it lets new
-users update their code without any extra steps, but it lowers the
-performance of your Puppet master.
-
-We recommend setting this to `unlimited` and explicitly refreshing your
-Puppet master as part of your code deployment process.
-
-* With Puppet Server, you should refresh environments by calling the
-  `environment-cache` API endpoint. See the docs for the Puppet Server
-  administrative API.
-* With a Rack Puppet master, you should restart the web server or the
-  application server. Passenger lets you touch a `restart.txt` file to
-  refresh an application without restarting Apache; see the Passenger docs
-  for details.
-
-We don't recommend using any value other than `0` or `unlimited`, since
-most Puppet masters use a pool of Ruby interpreters which all have their
-own cache timers. When these timers drift out of sync, agents can be served
-inconsistent catalogs.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="environmentpath">
-          <description>
-            <loctext xml:lang="C">
-A search path for directory environments, as a list of directories
-separated by the system path separator character. (The POSIX path separator
-is ':', and the Windows path separator is ';'.)
-
-This setting must have a value set to enable **directory environments.** The
-recommended value is `$confdir/environments`. For more details, see
-http://docs.puppetlabs.com/puppet/latest/reference/environments.html
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="evaltrace">
-          <description>
-            <loctext xml:lang="C">
-Whether each resource should log when it is
-being evaluated.  This allows you to interactively see exactly
-what is being done.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="external_nodes">
-          <description>
-            <loctext xml:lang="C">
-An external command that can produce node information.  The command's output
-must be a YAML dump of a hash, and that hash must have a `classes` key and/or
-a `parameters` key, where `classes` is an array or hash and
-`parameters` is a hash.  For unknown nodes, the command should
-exit with a non-zero exit code.
-
-This command makes it straightforward to store your node mapping
-information in other data sources like databases.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="factpath">
-          <description>
-            <loctext xml:lang="C">
-Where Puppet should look for facts.  Multiple directories should
-be separated by the system path separator character. (The POSIX path
-separator is ':', and the Windows path separator is ';'.)
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="facts_terminus">
-          <description>
-            <loctext xml:lang="C">
-The node facts terminus.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="fileserverconfig">
-          <description>
-            <loctext xml:lang="C">
-Where the fileserver configuration is stored.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="integer" name="filetimeout">
-          <description>
-            <loctext xml:lang="C">
-The minimum time to wait between checking for updates in
-configuration files.  This timeout determines how quickly Puppet checks whether
-a file (such as manifests or templates) has changed on disk. This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y).
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="forge_authorization">
-          <description>
-            <loctext xml:lang="C">
-The authorization key to connect to the Puppet Forge. Leave blank for unauthorized or license based connections
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="freeze_main">
-          <description>
-            <loctext xml:lang="C">
-Freezes the 'main' class, disallowing any code to be added to it.  This
-essentially means that you can't have any code outside of a node,
-class, or definition other than in the site manifest.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="genmanifest">
-          <description>
-            <loctext xml:lang="C">
-Whether to just print a manifest to stdout and exit.  Only makes
-sense when specified on the command line as `--genmanifest`.  Takes into account arguments specified
-on the CLI.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="graph">
-          <description>
-            <loctext xml:lang="C">
-Whether to create dot graph files for the different
-configuration graphs.  These dot files can be interpreted by tools
-like OmniGraffle or dot (which is part of ImageMagick).
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="graphdir">
-          <description>
-            <loctext xml:lang="C">
-Where to store dot-outputted graphs.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="group">
-          <description>
-            <loctext xml:lang="C">
-The group puppet master should run as.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="hiera_config">
-          <description>
-            <loctext xml:lang="C">
-The hiera configuration file. Puppet only reads this file on startup, so you must restart the puppet master every time you edit it.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="hostcert">
-          <description>
-            <loctext xml:lang="C">
-Where individual hosts store and look for their certificates.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="hostcrl">
-          <description>
-            <loctext xml:lang="C">
-Where the host's certificate revocation list can be found.
-This is distinct from the certificate authority's CRL.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="hostcsr">
-          <description>
-            <loctext xml:lang="C">
-Where individual hosts store and look for their certificate requests.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="hostprivkey">
-          <description>
-            <loctext xml:lang="C">
-Where individual hosts store and look for their private key.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="hostpubkey">
-          <description>
-            <loctext xml:lang="C">
-Where individual hosts store and look for their public key.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="http_compression">
-          <description>
-            <loctext xml:lang="C">
-Allow http compression in REST communication with the master.
-This setting might improve performance for agent -&gt; master
-communications over slow WANs. Your puppet master needs to support
-compression (usually by activating some settings in a reverse-proxy in
-front of the puppet master, which rules out webrick). It is harmless to
-activate this settings if your master doesn't support compression, but
-if it supports it, this setting might reduce performance on high-speed LANs.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="http_debug">
-          <description>
-            <loctext xml:lang="C">
-Whether to write HTTP request and responses to stderr. This should never be used in a production environment.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="integer" name="http_keepalive_timeout">
-          <description>
-            <loctext xml:lang="C">
-The maximum amount of time a persistent HTTP connection can remain idle in the connection pool, before it is closed.  This timeout should be shorter than the keepalive timeout used on the HTTP server, e.g. Apache KeepAliveTimeout directive.
-This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y).
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="host" name="http_proxy_host">
-          <description>
-            <loctext xml:lang="C">
-The HTTP proxy host to use for outgoing connections.  Note: You
-may need to use a FQDN for the server hostname when using a proxy. Environment variable
-http_proxy or HTTP_PROXY will override this value
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="http_proxy_password">
-          <description>
-            <loctext xml:lang="C">
-The password for the user of an authenticated HTTP proxy.
-Requires the `http_proxy_user` setting.
-
-Note that passwords must be valid when used as part of a URL. If a password
-contains any characters with special meanings in URLs (as specified by RFC 3986
-` would become `%23`.)
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="integer" name="http_proxy_port">
-          <description>
-            <loctext xml:lang="C">
-The HTTP proxy port to use for outgoing connections
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="http_proxy_user">
-          <description>
-            <loctext xml:lang="C">
-The user name for an authenticated HTTP proxy. Requires the `http_proxy_host` setting.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="httplog">
-          <description>
-            <loctext xml:lang="C">
-Where the puppet agent web server logs.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="ignorecache">
-          <description>
-            <loctext xml:lang="C">
-Ignore cache and always recompile the configuration.  This is
-useful for testing new configurations, where the local cache may in
-fact be stale even if the timestamps are up to date - if the facts
-change or if the server changes.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="ignoreimport">
-          <description>
-            <loctext xml:lang="C">
-If true, allows the parser to continue without requiring
-all files referenced with `import` statements to exist. This setting was primarily
-designed for use with commit hooks for parse-checking.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="ignoremissingtypes">
-          <description>
-            <loctext xml:lang="C">
-Skip searching for classes and definitions that were missing during a
-prior compilation. The list of missing objects is maintained per-environment and
-persists until the environment is cleared or the master is restarted.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="ignoreschedules">
-          <description>
-            <loctext xml:lang="C">
-Boolean; whether puppet agent should ignore schedules.  This is useful
-for initial puppet agent runs.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="immutable_node_data">
-          <description>
-            <loctext xml:lang="C">
-When true, also prevents $trusted and $facts from being overridden in any scope
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="integer" name="inventory_port">
-          <description>
-            <loctext xml:lang="C">
-The port to communicate with the inventory_server.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="host" name="inventory_server">
-          <description>
-            <loctext xml:lang="C">
-The server to send facts to.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="inventory_terminus">
-          <description>
-            <loctext xml:lang="C">
-Should usually be the same as the facts terminus
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="integer" name="keylength">
-          <description>
-            <loctext xml:lang="C">
-The bit length of keys.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="lastrunfile">
-          <description>
-            <loctext xml:lang="C">
-Where puppet agent stores the last run report summary in yaml format.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="lastrunreport">
-          <description>
-            <loctext xml:lang="C">
-Where puppet agent stores the last run report in yaml format.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="ldapattrs">
-          <description>
-            <loctext xml:lang="C">
-The LDAP attributes to include when querying LDAP for nodes.  All
-returned attributes are set as variables in the top-level scope.
-Multiple values should be comma-separated.  The value 'all' returns
-all attributes.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="ldapbase">
-          <description>
-            <loctext xml:lang="C">
-The search base for LDAP searches.  It's impossible to provide
-a meaningful default here, although the LDAP libraries might
-have one already set.  Generally, it should be the 'ou=Hosts'
-branch under your main directory.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="ldapclassattrs">
-          <description>
-            <loctext xml:lang="C">
-The LDAP attributes to use to define Puppet classes.  Values
-should be comma-separated.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="ldapparentattr">
-          <description>
-            <loctext xml:lang="C">
-The attribute to use to define the parent node.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="ldappassword">
-          <description>
-            <loctext xml:lang="C">
-The password to use to connect to LDAP.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="integer" name="ldapport">
-          <description>
-            <loctext xml:lang="C">
-The LDAP port.  Only used if `node_terminus` is set to `ldap`.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="host" name="ldapserver">
-          <description>
-            <loctext xml:lang="C">
-The LDAP server.  Only used if `node_terminus` is set to `ldap`.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="ldapssl">
-          <description>
-            <loctext xml:lang="C">
-Whether SSL should be used when searching for nodes.
-Defaults to false because SSL usually requires certificates
-to be set up on the client side.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="ldapstackedattrs">
-          <description>
-            <loctext xml:lang="C">
-The LDAP attributes that should be stacked to arrays by adding
-the values in all hierarchy elements of the tree.  Values
-should be comma-separated.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="ldapstring">
-          <description>
-            <loctext xml:lang="C">
-The search string used to find an LDAP node.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="ldaptls">
-          <description>
-            <loctext xml:lang="C">
-Whether TLS should be used when searching for nodes.
-Defaults to false because TLS usually requires certificates
-to be set up on the client side.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="hostname" name="ldapuser">
-          <description>
-            <loctext xml:lang="C">
-The user to use to connect to LDAP.  Must be specified as a
-full DN.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="legacy_query_parameter_serialization">
-          <description>
-            <loctext xml:lang="C">
-The serialization format to use when sending file_metadata
-query parameters.  Older versions of puppet master expect certain query
-parameters to be serialized as yaml, which is deprecated.
-
-This should almost always be false. It can be temporarily set to true
-to let agents using this Puppet version connect to a puppet master
-running Puppet 3.0.0 through 3.2.x.
-
-Note that this is set to true automatically if the agent detects an
-older master, so should never need to be set explicitly.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="libdir">
-          <description>
-            <loctext xml:lang="C">
-An extra search path for Puppet.  This is only useful
-for those files that Puppet will load on demand, and is only
-guaranteed to work for those cases.  In fact, the autoload
-mechanism is responsible for making sure this directory
-is in Ruby's search path
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="listen">
-          <description>
-            <loctext xml:lang="C">
-Whether puppet agent should listen for
-connections.  If this is true, then puppet agent will accept incoming
-REST API requests, subject to the default ACLs and the ACLs set in
-the `rest_authconfig` file. Puppet agent can respond usefully to
-requests on the `run`, `facts`, `certificate`, and `resource` endpoints.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="localcacert">
-          <description>
-            <loctext xml:lang="C">
-Where each client stores the CA certificate.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="localconfig">
-          <description>
-            <loctext xml:lang="C">
-Where puppet agent caches the local configuration.  An
-extension indicating the cache format is added automatically.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="log_level">
-          <description>
-            <loctext xml:lang="C">
-Default logging level for messages from Puppet. Allowed values are:
-
-* debug
-* info
-* notice
-* warning
-* err
-* alert
-* emerg
-* crit
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="logdir">
-          <description>
-            <loctext xml:lang="C">
-The directory in which to store log files
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="manage_internal_file_permissions">
-          <description>
-            <loctext xml:lang="C">
-Whether Puppet should manage the owner, group, and mode of files it uses internally
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="manifest">
-          <description>
-            <loctext xml:lang="C">
-The entry-point manifest for puppet master. This can be one file
-or a directory of manifests to be evaluated in alphabetical order. Puppet manages
-this path as a directory if one exists or if the path ends with a / or \.
-
-Setting a global value for `manifest` in puppet.conf is deprecated. Please use
-directory environments instead. If you need to use something other than the
-environment's `manifests` directory as the main manifest, you can set
-`manifest` in environment.conf. For more info, see
-http://docs.puppetlabs.com/puppet/latest/reference/environments.html
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="manifestdir">
-          <description>
-            <loctext xml:lang="C">
-Used to build the default value of the `manifest` setting. Has no other purpose.
-
-This setting is deprecated.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="masterhttplog">
-          <description>
-            <loctext xml:lang="C">
-Where the puppet master web server saves its access log. This is
-only used when running a WEBrick puppet master. When puppet master is
-running under a Rack server like Passenger, that web server will have
-its own logging behavior.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="masterlog">
-          <description>
-            <loctext xml:lang="C">
-This file is literally never used, although Puppet may create it
-as an empty file. For more context, see the `puppetdlog` setting and
-puppet master's `--logdest` command line option.
-
-This setting is deprecated and will be removed in a future version of Puppet.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="integer" name="masterport">
-          <description>
-            <loctext xml:lang="C">
-The port for puppet master traffic. For puppet master,
-this is the port to listen on; for puppet agent, this is the port
-to make requests on. Both applications use this setting to get the port.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="integer" name="max_deprecations">
-          <description>
-            <loctext xml:lang="C">
-Sets the max number of logged/displayed parser validation deprecation
-warnings in case multiple deprecation warnings have been detected. A value of 0
-blocks the logging of deprecation warnings.  The count is per manifest.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="integer" name="max_errors">
-          <description>
-            <loctext xml:lang="C">
-Sets the max number of logged/displayed parser validation errors in case
-multiple errors have been detected. A value of 0 is the same as a value of 1; a
-minimum of one error is always raised.  The count is per manifest.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="integer" name="max_warnings">
-          <description>
-            <loctext xml:lang="C">
-Sets the max number of logged/displayed parser validation warnings in
-case multiple warnings have been detected. A value of 0 blocks logging of
-warnings.  The count is per manifest.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="integer" name="maximum_uid">
-          <description>
-            <loctext xml:lang="C">
-The maximum allowed UID.  Some platforms use negative UIDs
-but then ship with tools that do not know how to handle signed ints,
-so the UIDs show up as huge numbers that can then not be fed back into
-the system.  This is a hackish way to fail in a slightly more useful
-way when that happens.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="mkusers">
-          <description>
-            <loctext xml:lang="C">
-Whether to create the necessary user and group that puppet agent will run as.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="module_groups">
-          <description>
-            <loctext xml:lang="C">
-Extra module groups to request from the Puppet Forge
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="uri" name="module_repository">
-          <description>
-            <loctext xml:lang="C">
-The module repository
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="module_skeleton_dir">
-          <description>
-            <loctext xml:lang="C">
-The directory which the skeleton for module tool generate is stored.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="module_working_dir">
-          <description>
-            <loctext xml:lang="C">
-The directory into which module tool data is stored
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="modulepath">
-          <description>
-            <loctext xml:lang="C">
-The search path for modules, as a list of directories separated by the system
-path separator character. (The POSIX path separator is ':', and the
-Windows path separator is ';'.)
-
-Setting a global value for `modulepath` in puppet.conf is deprecated. Please use
-directory environments instead. If you need to use something other than the
-default modulepath of `&lt;ACTIVE ENVIRONMENT'S MODULES DIR&gt;:$basemodulepath`,
-you can set `modulepath` in environment.conf. For more info, see
-http://docs.puppetlabs.com/puppet/latest/reference/environments.html
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="name">
-          <description>
-            <loctext xml:lang="C">
-The name of the application, if we are running as one.  The
-default is essentially $0 without the path or `.rb`.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="node_cache_terminus">
-          <description>
-            <loctext xml:lang="C">
-How to store cached nodes.
-Valid values are (none), 'json', 'msgpack', 'yaml' or write only yaml ('write_only_yaml').
-The master application defaults to 'write_only_yaml', all others to none.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="node_name">
-          <description>
-            <loctext xml:lang="C">
-How the puppet master determines the client's identity
-and sets the 'hostname', 'fqdn' and 'domain' facts for use in the manifest,
-in particular for determining which 'node' statement applies to the client.
-Possible values are 'cert' (use the subject's CN in the client's
-certificate) and 'facter' (use the hostname that the client
-reported in its facts)
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="node_name_fact">
-          <description>
-            <loctext xml:lang="C">
-The fact name used to determine the node name used for all requests the agent
-makes to the master. WARNING: This setting is mutually exclusive with
-node_name_value.  Changing this setting also requires changes to the default
-auth.conf configuration on the Puppet Master.  Please see
-http://links.puppetlabs.com/node_name_fact for more information.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="node_name_value">
-          <description>
-            <loctext xml:lang="C">
-The explicit value used for the node name for all requests the agent
-makes to the master. WARNING: This setting is mutually exclusive with
-node_name_fact.  Changing this setting also requires changes to the default
-auth.conf configuration on the Puppet Master.  Please see
-http://links.puppetlabs.com/node_name_value for more information.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="node_terminus">
-          <description>
-            <loctext xml:lang="C">
-Where to find information about nodes.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="noop">
-          <description>
-            <loctext xml:lang="C">
-Whether to apply catalogs in noop mode, which allows Puppet to
-partially simulate a normal run. This setting affects puppet agent and
-puppet apply.
-
-When running in noop mode, Puppet will check whether each resource is in sync,
-like it does when running normally. However, if a resource attribute is not in
-the desired state (as declared in the catalog), Puppet will take no
-action, and will instead report the changes it _would_ have made. These
-simulated changes will appear in the report sent to the puppet master, or
-be shown on the console if running puppet agent or puppet apply in the
-foreground. The simulated changes will not send refresh events to any
-subscribing or notified resources, although Puppet will log that a refresh
-event _would_ have been sent.
-
-**Important note:**
-noop)
-allows you to apply individual resources in noop mode, and will override
-the global value of the `noop` setting. This means a resource with
-`noop =&gt; false` _will_ be changed if necessary, even when running puppet
-agent with `noop = true` or `--noop`. (Conversely, a resource with
-`noop =&gt; true` will only be simulated, even when noop mode is globally disabled.)
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="onetime">
-          <description>
-            <loctext xml:lang="C">
-Perform one configuration run and exit, rather than spawning a long-running
-daemon. This is useful for interactively running puppet agent, or
-running puppet agent from cron.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="ordering">
-          <description>
-            <loctext xml:lang="C">
-How unrelated resources should be ordered when applying a catalog.
-Allowed values are `title-hash`, `manifest`, and `random`. This
-setting affects puppet agent and puppet apply, but not puppet master.
-
-* `title-hash` (the default) will order resources randomly, but will use
-  the same order across runs and across nodes.
-* `manifest` will use the order in which the resources were declared in
-  their manifest files.
-* `random` will order resources randomly and change their order with each
-  run. This can work like a fuzzer for shaking out undeclared dependencies.
-
-Regardless of this setting's value, Puppet will always obey explicit
-dependencies set with the before/require/notify/subscribe metaparameters
-and the `-&gt;`/`~&gt;` chaining arrows; this setting only affects the relative
-ordering of _unrelated_ resources.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="parser">
-          <description>
-            <loctext xml:lang="C">
-Selects the parser to use for parsing puppet manifests (in puppet DSL
-language/'.pp' files). Available choices are `current` (the default)
-and `future`.
-
-The `current` parser means that the released version of the parser should
-be used.
-
-The `future` parser is a "time travel to the future" allowing early
-exposure to new language features. What these features are will vary from
-release to release and they may be invididually configurable.
-
-Available Since Puppet 3.2.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="passfile">
-          <description>
-            <loctext xml:lang="C">
-Where puppet agent stores the password for its private key.
-Generally unused.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="path">
-          <description>
-            <loctext xml:lang="C">
-The shell search path.  Defaults to whatever is inherited
-from the parent process.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="pidfile">
-          <description>
-            <loctext xml:lang="C">
-The file containing the PID of a running process.
-This file is intended to be used by service management frameworks
-and monitoring systems to determine if a puppet process is still in
-the process table.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="plugindest">
-          <description>
-            <loctext xml:lang="C">
-Where Puppet should store plugins that it pulls down from the central
-server.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="pluginfactdest">
-          <description>
-            <loctext xml:lang="C">
-Where Puppet should store external facts that are being handled by pluginsync
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="pluginfactsource">
-          <description>
-            <loctext xml:lang="C">
-Where to retrieve external facts for pluginsync
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="pluginsignore">
-          <description>
-            <loctext xml:lang="C">
-What files to ignore when pulling down plugins.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="pluginsource">
-          <description>
-            <loctext xml:lang="C">
-From where to retrieve plugins.  The standard Puppet `file` type
-is used for retrieval, so anything that is a valid file source can
-be used here.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="pluginsync">
-          <description>
-            <loctext xml:lang="C">
-Whether plugins should be synced with the central server.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="postrun_command">
-          <description>
-            <loctext xml:lang="C">
-A command to run after every agent run.  If this command returns a non-zero
-return code, the entire Puppet run will be considered to have failed, even though it might have
-performed work during the normal run.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="preferred_serialization_format">
-          <description>
-            <loctext xml:lang="C">
-The preferred means of serializing
-ruby instances for passing over the wire.  This won't guarantee that all
-instances will be serialized using this method, since not all classes
-can be guaranteed to support this format, but it will be used for all
-classes that support it.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="prerun_command">
-          <description>
-            <loctext xml:lang="C">
-A command to run before every agent run.  If this command returns a non-zero
-return code, the entire Puppet run will fail.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="preview_outputdir">
-          <description>
-            <loctext xml:lang="C">
-The directory where catalog previews per node are generated.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="priority">
-          <description>
-            <loctext xml:lang="C">
-The scheduling priority of the process.  Valid values are 'high',
-'normal', 'low', or 'idle', which are mapped to platform-specific
-values.  The priority can also be specified as an integer value and
-will be passed as is, e.g. -5.  Puppet must be running as a privileged
-user in order to increase scheduling priority.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="privatedir">
-          <description>
-            <loctext xml:lang="C">
-Where the client stores private certificate information.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="privatekeydir">
-          <description>
-            <loctext xml:lang="C">
-The private key directory.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="profile">
-          <description>
-            <loctext xml:lang="C">
-Whether to enable experimental performance profiling
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="publickeydir">
-          <description>
-            <loctext xml:lang="C">
-The public key directory.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="puppetdlog">
-          <description>
-            <loctext xml:lang="C">
-The fallback log file. This is only used when the `--logdest` option
-is not specified AND Puppet is running on an operating system where both
-the POSIX syslog service and the Windows Event Log are unavailable. (Currently,
-no supported operating systems match that description.)
-
-Despite the name, both puppet agent and puppet master will use this file
-as the fallback logging destination.
-
-For control over logging destinations, see the `--logdest` command line
-option in the manual pages for puppet master, puppet agent, and puppet
-apply. You can see man pages by running `puppet &lt;SUBCOMMAND&gt; --help`,
-or read them online at http://docs.puppetlabs.com/references/latest/man/.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="integer" name="puppetport">
-          <description>
-            <loctext xml:lang="C">
-Which port puppet agent listens on.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="uri" name="queue_source">
-          <description>
-            <loctext xml:lang="C">
-Which type of queue to use for asynchronous processing.  If your stomp server requires
-authentication, you can include it in the URI as long as your stomp client library is at least 1.1.1
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="queue_type">
-          <description>
-            <loctext xml:lang="C">
-Which type of queue to use for asynchronous processing.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="rails_loglevel">
-          <description>
-            <loctext xml:lang="C">
-The log level for Rails connections.  The value must be
-a valid log level within Rails.  Production environments normally use `info`
-and other environments normally use `debug`. This setting is only used by the ActiveRecord storeconfigs and inventory backends, which are deprecated.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="railslog">
-          <description>
-            <loctext xml:lang="C">
-Where Rails-specific logs are sent. This setting is only used by the ActiveRecord storeconfigs and inventory backends, which are deprecated.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="report">
-          <description>
-            <loctext xml:lang="C">
-Whether to send reports after every transaction.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="integer" name="report_port">
-          <description>
-            <loctext xml:lang="C">
-The port to communicate with the report_server.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="report_serialization_format">
-          <description>
-            <loctext xml:lang="C">
-The serialization format to use when sending reports to the
-`report_server`. Possible values are `pson` and `yaml`. This setting
-affects puppet agent, but not puppet apply (which processes its own
-reports).
-
-This should almost always be set to `pson`. It can be temporarily set to
-`yaml` to let agents using this Puppet version connect to a puppet master
-running Puppet 3.0.0 through 3.2.x.
-
-Note that this is set to 'yaml' automatically if the agent detects an
-older master, so should never need to be set explicitly.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="host" name="report_server">
-          <description>
-            <loctext xml:lang="C">
-The server to send transaction reports to.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="reportdir">
-          <description>
-            <loctext xml:lang="C">
-The directory in which to store reports. Each node gets
-a separate subdirectory in this directory. This setting is only
-used when the `store` report processor is enabled (see the
-`reports` setting).
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="reportfrom">
-          <description>
-            <loctext xml:lang="C">
-The 'from' email address for the reports.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="reports">
-          <description>
-            <loctext xml:lang="C">
-The list of report handlers to use. When using multiple report handlers,
-their names should be comma-separated, with whitespace allowed. (For example,
-`reports = http, tagmail`.)
-
-This setting is relevant to puppet master and puppet apply. The puppet
-master will call these report handlers with the reports it receives from
-agent nodes, and puppet apply will call them with its own report. (In
-all cases, the node applying the catalog must have `report = true`.)
-
-See the report reference for information on the built-in report
-handlers; custom report handlers can also be loaded from modules.
-(Report handlers are loaded from the lib directory, at
-`puppet/reports/NAME.rb`.)
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="uri" name="reporturl">
-          <description>
-            <loctext xml:lang="C">
-The URL that reports should be forwarded to. This setting
-is only used when the `http` report processor is enabled (see the
-`reports` setting).
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="integer" name="req_bits">
-          <description>
-            <loctext xml:lang="C">
-The bit length of the certificates.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="requestdir">
-          <description>
-            <loctext xml:lang="C">
-Where host certificate requests are stored.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="resourcefile">
-          <description>
-            <loctext xml:lang="C">
-The file in which puppet agent stores a list of the resources
-associated with the retrieved configuration.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="rest_authconfig">
-          <description>
-            <loctext xml:lang="C">
-The configuration file that defines the rights to the different
-rest indirections.  This can be used as a fine-grained
-authorization system for `puppet master`.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="route_file">
-          <description>
-            <loctext xml:lang="C">
-The YAML file containing indirector route configuration.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="rrddir">
-          <description>
-            <loctext xml:lang="C">
-The directory where RRD database files are stored.
-Directories for each reporting host will be created under
-this directory.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="integer" name="rrdinterval">
-          <description>
-            <loctext xml:lang="C">
-How often RRD should expect data.
-This should match how often the hosts report back to the server. This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y).
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="rundir">
-          <description>
-            <loctext xml:lang="C">
-Where Puppet PID files are kept.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="integer" name="runinterval">
-          <description>
-            <loctext xml:lang="C">
-How often puppet agent applies the catalog.
-Note that a runinterval of 0 means "run continuously" rather than
-"never run." If you want puppet agent to never run, you should start
-it with the `--no-client` option. This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y).
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="sendmail">
-          <description>
-            <loctext xml:lang="C">
-Where to find the sendmail binary with which to send email.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="serial">
-          <description>
-            <loctext xml:lang="C">
-Where the serial number for certificates is stored.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="host" name="server">
-          <description>
-            <loctext xml:lang="C">
-The puppet master server to which the puppet agent should connect.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="server_datadir">
-          <description>
-            <loctext xml:lang="C">
-The directory in which serialized data is stored, usually in a subdirectory.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="show_diff">
-          <description>
-            <loctext xml:lang="C">
-Whether to log and report a contextual diff when files are being replaced.
-This causes partial file contents to pass through Puppet's normal
-logging and reporting system, so this setting should be used with
-caution if you are sending Puppet's reports to an insecure
-destination. This feature currently requires the `diff/lcs` Ruby
-library.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="signeddir">
-          <description>
-            <loctext xml:lang="C">
-Where the CA stores signed certificates.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="smtphelo">
-          <description>
-            <loctext xml:lang="C">
-The name by which we identify ourselves in SMTP HELO for reports.
-If you send to a smtpserver which does strict HELO checking (as with Postfix's
-`smtpd_helo_restrictions` access controls), you may need to ensure this resolves.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="integer" name="smtpport">
-          <description>
-            <loctext xml:lang="C">
-The TCP port through which to send email reports.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="host" name="smtpserver">
-          <description>
-            <loctext xml:lang="C">
-The server through which to send email reports.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="splay">
-          <description>
-            <loctext xml:lang="C">
-Whether to sleep for a pseudo-random (but consistent) amount of time before
-a run.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="integer" name="splaylimit">
-          <description>
-            <loctext xml:lang="C">
-The maximum time to delay before runs.  Defaults to being the same as the
-run interval. This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y).
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="host" name="srv_domain">
-          <description>
-            <loctext xml:lang="C">
-The domain which will be queried to find the SRV records of servers to use.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="ssl_client_ca_auth">
-          <description>
-            <loctext xml:lang="C">
-Certificate authorities who issue server certificates.  SSL servers will not be
-considered authentic unless they possess a certificate issued by an authority
-listed in this file.  If this setting has no value then the Puppet master's CA
-certificate (localcacert) will be used.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="ssl_client_header">
-          <description>
-            <loctext xml:lang="C">
-The header containing an authenticated client's SSL DN.
-This header must be set by the proxy to the authenticated client's SSL
-DN (e.g., `/CN=puppet.puppetlabs.com`).  Puppet will parse out the Common
-Name (CN) from the Distinguished Name (DN) and use the value of the CN
-field for authorization.
-
-Note that the name of the HTTP header gets munged by the web server
-common gateway inteface: an `HTTP_` prefix is added, dashes are converted
-to underscores, and all letters are uppercased.  Thus, to use the
-`X-Client-DN` header, this setting should be `HTTP_X_CLIENT_DN`.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="ssl_client_verify_header">
-          <description>
-            <loctext xml:lang="C">
-The header containing the status message of the client
-verification. This header must be set by the proxy to 'SUCCESS' if the
-client successfully authenticated, and anything else otherwise.
-
-Note that the name of the HTTP header gets munged by the web server
-common gateway inteface: an `HTTP_` prefix is added, dashes are converted
-to underscores, and all letters are uppercased.  Thus, to use the
-`X-Client-Verify` header, this setting should be
-`HTTP_X_CLIENT_VERIFY`.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="ssl_server_ca_auth">
-          <description>
-            <loctext xml:lang="C">
-Certificate authorities who issue client certificates.  SSL clients will not be
-considered authentic unless they possess a certificate issued by an authority
-listed in this file.  If this setting has no value then the Puppet master's CA
-certificate (localcacert) will be used.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="ssldir">
-          <description>
-            <loctext xml:lang="C">
-Where SSL certificates are kept.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="statedir">
-          <description>
-            <loctext xml:lang="C">
-The directory where Puppet state is stored.  Generally,
-this directory can be removed without causing harm (although it
-might result in spurious service restarts).
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="statefile">
-          <description>
-            <loctext xml:lang="C">
-Where puppet agent and puppet master store state associated
-with the running configuration.  In the case of puppet master,
-this file reflects the state discovered through interacting
-with clients.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="storeconfigs">
-          <description>
-            <loctext xml:lang="C">
-Whether to store each client's configuration, including catalogs, facts,
-and related data.  This also enables the import and export of resources in
-the Puppet language - a mechanism for exchange resources between nodes.
-
-By default this uses ActiveRecord and an SQL database to store and query
-the data; this, in turn, will depend on Rails being available.
-
-You can adjust the backend using the storeconfigs_backend setting.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="storeconfigs_backend">
-          <description>
-            <loctext xml:lang="C">
-Configure the backend terminus used for StoreConfigs.
-By default, this uses the ActiveRecord store, which directly talks to the
-database from within the Puppet Master process.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="strict_hostname_checking">
-          <description>
-            <loctext xml:lang="C">
-Whether to only search for the complete
-hostname as it is in the certificate when searching for node information
-in the catalogs.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="strict_variables">
-          <description>
-            <loctext xml:lang="C">
-Makes the parser raise errors when referencing unknown variables. (This does not affect
-referencing variables that are explicitly set to undef).
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="stringify_facts">
-          <description>
-            <loctext xml:lang="C">
-to_s. Means you can't have arrays or
-hashes as fact values. (DEPRECATED) This option will be removed in Puppet 4.0.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="summarize">
-          <description>
-            <loctext xml:lang="C">
-Whether to print a transaction summary.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="syslogfacility">
-          <description>
-            <loctext xml:lang="C">
-What syslog facility to use when logging to syslog.
-Syslog has a fixed list of valid facilities, and you must
-choose one of those; you cannot just make one up.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="tagmap">
-          <description>
-            <loctext xml:lang="C">
-The mapping between reporting tags and email addresses.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="tags">
-          <description>
-            <loctext xml:lang="C">
-Tags to use to find resources.  If this is set, then
-only resources tagged with the specified tags will be applied.
-Values must be comma-separated.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="templatedir">
-          <description>
-            <loctext xml:lang="C">
-Where Puppet looks for template files.  Can be a list of colon-separated
-directories.
-
-This setting is deprecated. Please put your templates in modules instead.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="thin_storeconfigs">
-          <description>
-            <loctext xml:lang="C">
-Boolean; whether Puppet should store only facts and exported resources in the storeconfigs
-database. This will improve the performance of exported resources with the older
-`active_record` backend, but will disable external tools that search the storeconfigs database.
-Thinning catalogs is generally unnecessary when using PuppetDB to store catalogs.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="trace">
-          <description>
-            <loctext xml:lang="C">
-Whether to print stack traces on some errors
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="trusted_node_data">
-          <description>
-            <loctext xml:lang="C">
-Stores trusted node data in a hash called $trusted.
-When true also prevents $trusted from being overridden in any scope.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="use_cached_catalog">
-          <description>
-            <loctext xml:lang="C">
-Whether to only use the cached catalog rather than compiling a new catalog
-on every run.  Puppet can be run with this enabled by default and then selectively
-disabled when a recompile is desired.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="use_srv_records">
-          <description>
-            <loctext xml:lang="C">
-Whether the server will search for SRV records in DNS for the current domain.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="usecacheonfailure">
-          <description>
-            <loctext xml:lang="C">
-Whether to use the cached configuration when the remote
-configuration will not compile.  This option is useful for testing
-new configurations, where you want to fix the broken configuration
-rather than reverting to a known-good one.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="user">
-          <description>
-            <loctext xml:lang="C">
-The user puppet master should run as.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="vardir">
-          <description>
-            <loctext xml:lang="C">
-Where Puppet stores dynamic and growing data.  The default for this
-setting is calculated specially, like `confdir`_.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="integer" name="waitforcert">
-          <description>
-            <loctext xml:lang="C">
-How frequently puppet agent should ask for a signed certificate.
-
-When starting for the first time, puppet agent will submit a certificate
-signing request (CSR) to the server named in the `ca_server` setting
-(usually the puppet master); this may be autosigned, or may need to be
-approved by a human, depending on the CA server's configuration.
-
-Puppet agent cannot apply configurations until its approved certificate is
-available. Since the certificate may or may not be available immediately,
-puppet agent will repeatedly try to fetch it at this interval. You can
-turn off waiting for certificates by specifying a time of 0, in which case
-puppet agent will exit if it cannot get a cert.
-This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y).
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="astring" name="yamldir">
-          <description>
-            <loctext xml:lang="C">
-The directory in which YAML data is stored, usually in a subdirectory.
-	    </loctext>
-          </description>
-        </prop_pattern>
-        <prop_pattern required="false" type="boolean" name="zlib">
-          <description>
-            <loctext xml:lang="C">
-Boolean; whether to use the zlib library
-	    </loctext>
-          </description>
-        </prop_pattern>
-      </pg_pattern>
-    </template>
-  </service>
-</service_bundle>
--- a/components/ruby/puppet-solaris/files/update_smf.py	Wed Jan 11 15:24:27 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,320 +0,0 @@
-#!/usr/bin/python2.7
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
-#
-
-'''
-Utility program for helping with the upgrade of puppet to a newer
-version.  This program will take a puppet configuration file that
-has been generated via the command sequence
-
-puppet agent --genconfig > puppet.conf
-
-and use the data in that configuration file to replace the
-associated Puppet SMF user configuratable properties with the
-properties that are allowed in the new version of puppet
-
-NOTE: This file should not be included with the puppet release
-'''
-
-import os
-import re
-import sys
-
-from lxml import etree
-from optparse import OptionParser
-
-
-COMMENT_PATTERN = re.compile(".*# ?(.*)")
-CONFIG_VALUE_PATTERN = re.compile("([\S]+)\s*=\s*(\S*)")
-
-DEFAULT_VALUE_STR = "The default value is "
-
-# SMF defined property types.  For a list of
-# all available types see
-# /usr/share/lib/xml/dtd/service_bundle.dtd.1
-TYPE_ASTRING = "astring"
-TYPE_BOOLEAN = "boolean"
-TYPE_INTEGER = "integer"
-TYPE_HOST = "host"
-TYPE_HOSTNAME = "hostname"
-TYPE_NETADDRESS = "net_address"
-TYPE_URI = "uri"
-
-
-# Dictionary of currently defined property types to associate
-# with a specified property.  Any property not defined here
-# is assumed to have a property type of astring, integer,
-# or boolean
-PROP_TYPE = {
-    'server': TYPE_HOST,
-    'archive_file_server': TYPE_HOST,
-    'bindaddress': TYPE_NETADDRESS,
-    'ca_server': TYPE_HOST,
-    'certname': TYPE_HOSTNAME,
-    'couchdb_url': TYPE_URI,
-    'dbserver': TYPE_HOST,
-    'dns_alt_names': TYPE_HOST,
-    'http_proxy_host': TYPE_HOST,
-    'inventory_server': TYPE_HOST,
-    'ldapserver': TYPE_HOST,
-    'ldapuser': TYPE_HOSTNAME,
-    'module_repository': TYPE_URI,
-    'queue_source': TYPE_URI,
-    'report_server': TYPE_HOST,
-    'reporturl': TYPE_URI,
-    'smtpserver': TYPE_HOST,
-    'srv_domain': TYPE_HOST,
-}
-
-# Dictionary used to hold properites and the resulting xml code
-PUPPET_CONFIG_DICT = dict()
-
-
-def err(msg):
-    '''Output standard error message'''
-    # Duplicate the syntax of the parser.error
-    sys.stderr.write("%(prog)s: error: %(msg)s\n" %
-                     {"prog": os.path.basename(sys.argv[0]), "msg": msg})
-
-
-def create_config_element(key, key_type, desc_text):
-    '''Create a basic xml entry following the basic pattern of
-
-        <prop_pattern name='${key}' type='${key_type}'
-                required='false'>
-                    <description> <loctext xml:lang='C'>
-                         ${desc_text}
-                    </loctext> </description>
-        </prop_pattern>
-    '''
-    prop_pattern = etree.Element(
-        "prop_pattern",
-        name=key,
-        type=key_type,
-        required="false")
-    desc = etree.SubElement(prop_pattern, "description")
-    loctext = etree.SubElement(desc, "loctext")
-    loctext.text = "\n%s\n\t    " % desc_text
-    loctext.set('{http://www.w3.org/XML/1998/namespace}lang', 'C')
-    return prop_pattern
-
-
-def determine_type(key, value):
-    '''Determine the xml property type to associate with the
-       specified key
-    '''
-
-    # Does the key have a specified xml property type
-    # already defined?
-    try:
-        return PROP_TYPE[key]
-    except KeyError:
-        pass
-
-    # Use the value to determine the xml property type
-    if value.isdigit():
-        return TYPE_INTEGER
-    if value.lower() in ['false', 'true']:
-        return TYPE_BOOLEAN
-    return TYPE_ASTRING
-
-
-def process_grouping(lines):
-    '''Process the lines in the list.  The last entry should be
-       a 'key=value' entry
-    '''
-
-    # The last field should be a key = value pair
-    # If it's not then the format of the file is not matching
-    # the expected format of
-    #
-    # Description
-    # The default value is "xxxx"
-    # key = value
-    #
-    key_value = lines.pop()
-    match = CONFIG_VALUE_PATTERN.match(key_value)
-    if not match:
-        raise TypeError("Last line in grouping is not in expected "
-                        "format of 'key = value'\n%s" %
-                        "\n".join(lines))
-    key = match.group(1)
-    value = match.group(2)
-
-    default_value_line = lines.pop()
-    if not default_value_line.startswith(DEFAULT_VALUE_STR):
-        # Not a match.  Last line was still part of the description
-        lines.append(default_value_line)
-
-    key_type = determine_type(key, value)
-
-    # remaining lines are the descriptor field
-    desc = '\n'.join(lines)
-    PUPPET_CONFIG_DICT[key] = (key, key_type, desc)
-
-
-def parse_puppet_config(filename):
-    '''Parse the puppet configuration file that is generated by
-       puppet agent --genconfig
-    '''
-    parameter_list = []
-    agent_check = True
-    with open(filename, 'r') as f_handle:
-        for line in f_handle:
-            if agent_check:
-                if line.startswith("[agent]"):
-                    # Throw away the initial starting block code in the
-                    del parameter_list[:]
-                    agent_check = False
-                    continue
-            line = line.strip().replace("\n", "")
-            if not line:
-                # If parameter_list is not empty, process the data and
-                # generate an xml structure
-                process_grouping(parameter_list)
-                # Done processing, delete all the saved entries
-                del parameter_list[:]
-                continue
-
-            match = COMMENT_PATTERN.match(line)
-            if match:
-                line = match.group(1)
-            parameter_list.append(line)
-    f_handle.close()
-
-
-def update_smf_file(smf_xml_file, output_file, version):
-    '''Replace the puppet property definitions in the specified SMF
-       file with those that are stored in PUPPET_CONFIG_DICT
-    '''
-
-    try:
-        parser = etree.XMLParser(remove_blank_text=True)
-        tree = etree.parse(smf_xml_file, parser)
-        root = tree.getroot()
-        template = root.find("service/template")
-        puppet_desc = template.find("common_name/loctext")
-        puppet_desc.text = "Puppet version %s" % version
-
-        pg_pattern = template.find("pg_pattern")
-    except IOError as msg:
-        err(msg)
-        return -1
-    except etree.XMLSyntaxError as msg:
-        err(msg)
-        return -1
-    except NameError as msg:
-        err("XML file %s does not match expected formated" % smf_xml_file)
-
-    # Delete the pg_pattern nodes and it's children
-    # This is the structure that will be rebuilt based
-    # on the genconfig information that was read in
-    if pg_pattern is not None:
-        template.remove(pg_pattern)
-
-    # <pg_pattern name='config' type='application' required='false'>
-    pg_pattern = etree.SubElement(
-        template,
-        "pg_pattern",
-        name="config",
-        type="application",
-        required="false")
-    for key in sorted(PUPPET_CONFIG_DICT.iterkeys()):
-        values = PUPPET_CONFIG_DICT[key]
-        element = create_config_element(values[0], values[1], values[2])
-        pg_pattern.append(element)
-
-    # Write out the contents of the updated puppet SMF config file
-    print "Writting out contents of new SMF configuration file to: %s" % \
-        output_file
-    with open(output_file, "w") as f_handle:
-        f_handle.write(etree.tostring(tree, pretty_print=True))
-    f_handle.close()
-
-
-def option_list():
-    '''Build the option list for this utility'''
-    desc = "Utility for assisting in the upgrading of Solaris Puppet SMF file"
-    usage = "usage: %prog -c <puppet_config_file> -s <smf_confilg_file> " \
-            "-v <puppet_version> [-o <output_file>]\n"
-    opt_list = OptionParser(description=desc, usage=usage)
-
-    opt_list.add_option("-c", "--config", dest="config", default=None,
-                        action="store", type="string", nargs=1,
-                        metavar="<puppet_config_file>",
-                        help="Puppet configuration file generated via"
-                             "genconfig option to puppet. i.e. "
-                             "puppet agent --genconfig > puppet.conf")
-    opt_list.add_option("-s", "--smf", dest="smf_xml", default=None,
-                        action="store", type="string", nargs=1,
-                        metavar="<smf_config_file>",
-                        help="Current solaris Puppet SMF XML configuration"
-                             " file. This file is located in <userland_tree>"
-                             "/components/puppet/files/puppet.xml")
-    opt_list.add_option("-o", "--output", dest="output", default=None,
-                        action="store", type="string", nargs=1,
-                        metavar="<output_file>",
-                        help="The name of the new puppet.xml file ")
-    opt_list.add_option("-v", "--version", dest="version", default="None",
-                        action="store", type="string", nargs=1,
-                        metavar="<puppet_version>",
-                        help="Puppet Version of update")
-
-    return opt_list
-
-
-def main():
-    '''Execute this utility based on the options supplied by the user'''
-    parser = option_list()
-
-    (options, _args) = parser.parse_args()
-
-    if not options.output and options.version:
-        options.output = "puppet.%s.xml" % options.version
-
-    if not options.config or not options.smf_xml or \
-            not options.output or not options.version:
-        err("Required options not specified")
-        parser.print_help()
-        sys.exit(-1)
-
-    if not os.path.isfile(options.config):
-        err("%s does not exist or is not a regular file\n"
-            % options.config)
-        sys.exit(-1)
-    if not os.path.isfile(options.smf_xml):
-        err("%s does not exist or is not a regular file\n"
-            % options.smf_xml)
-        sys.exit(-1)
-    if os.path.exists(options.output):
-        err("specified file %s already exist\n"
-            % options.output)
-        sys.exit(-1)
-
-    parse_puppet_config(options.config)
-    update_smf_file(options.smf_xml, options.output, options.version)
-
-if __name__ == '__main__':
-    main()
--- a/components/ruby/puppet-solaris/files/user_attr	Wed Jan 11 15:24:27 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-puppet::RO::audit_flags=cusa\:no
--- a/components/ruby/puppet-solaris/puppet-solaris.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
-#
-set name=pkg.fmri \
-    value=pkg:/system/management/puppet/puppet-solaris@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary \
-    value="Solaris specific components and auditing support for Puppet"
-set name=com.oracle.info.description \
-    value="Solaris specific components and auditing support for Puppet"
-set name=info.classification \
-    value="org.opensolaris.category.2008:System/Administration and Configuration"
-set name=org.opensolaris.arc-caseid value=PSARC/2013/005 value=PSARC/2013/218 \
-    value=PSARC/2013/221 value=PSARC/2013/288 value=PSARC/2013/426
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=org.opensolaris.smf.fmri value=svc:/application/puppet:agent \
-    value=svc:/application/puppet:master
-file files/puppet.logadm.conf path=etc/logadm.d/puppet.logadm.conf group=sys \
-    restart_fmri=svc:/system/logadm-upgrade:default
-file files/auth_attr path=etc/security/auth_attr.d/puppet
-file files/exec_attr path=etc/security/exec_attr.d/puppet
-file files/prof_attr path=etc/security/prof_attr.d/puppet
-file files/user_attr path=etc/user_attr.d/puppet
-file files/puppet.xml path=lib/svc/manifest/application/puppet.xml
-file files/puppet.stencil path=lib/svc/stencils/puppet.stencil
-file ext/PuppetAudit.so \
-    path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/$(MACH64)-solaris$(SOLARIS_VERSION)/PuppetAudit.so
-group groupname=puppet gid=40
-user username=puppet ftpuser=false gcos-field="Puppet Admin" group=puppet \
-    home-dir=/etc/puppet login-shell=/bin/false uid=40
-license puppet.license license=Oracle
-
-# Require puppet
-depend type=require fmri=system/management/puppet
-
-# Require puppet module for Solaris
-depend type=require fmri=system/management/puppet/oracle-solaris_providers
--- a/components/ruby/puppet-solaris/puppet.license	Wed Jan 11 15:24:27 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
--- a/components/ruby/puppet/Makefile	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet/Makefile	Mon Nov 28 16:54:02 2016 -0800
@@ -28,33 +28,59 @@
 RUBY_VERSIONS=2.1.0
 
 COMPONENT_NAME=		puppet
-COMPONENT_VERSION=	3.8.6
+COMPONENT_VERSION=	4.7.0
 COMPONENT_PROJECT_URL=	http://puppetlabs.com/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:99ccccd1016d30914f69d96355002818aa8087dfb9e1e6e40578aa67fee77da8
+		sha256:f7eec9099c04a9ad65ee41b6c525b612c487e9a277d4d9ecaea587bb93c130bc
 COMPONENT_ARCHIVE_URL=	http://downloads.puppetlabs.com/puppet/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/puppet
 
-TPNO=			27309
+TPNO=			32470
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/install.rb.mk
 include $(WS_MAKE_RULES)/ips.mk
 include $(WS_MAKE_RULES)/ruby.mk
 
-# puppet requires facter and hiera as part of the install phase 
+# puppet requires facter and hiera as part of the install phase
 FACTER_LIB=$(WS_TOP)/components/ruby/facter/build/$(MACH)/lib
 HIERA_LIB=$(WS_TOP)/components/ruby/hiera/build/$(MACH)/lib
 COMPONENT_INSTALL_ENV	+= RUBYLIB="$(FACTER_LIB):$(HIERA_LIB)"
 
 ../facter/build/%/.installed:
-	(cd ../facter ; $(GMAKE) install)
+	cd ../facter ; $(GMAKE) install
 
 ../hiera/build/%/.installed:
-	(cd ../hiera ; $(GMAKE) install)
+	cd ../hiera ; $(GMAKE) install
+
+
+SECURITY_FILES=$(addprefix files/,auth_attr exec_attr prof_attr)
+ETC_FILES=$(addprefix files/,user_attr)
+
+ext/PuppetAudit.so:
+	# Ruby extension for auditing
+	cd ext; $(RUBY) extconf.rb; $(GMAKE)
 
+clean::
+	@if [ -f ext/Makefile ]; then \
+		cd ext; $(GMAKE) clean; $(RM) Makefile; \
+	fi
+
+$(BUILD_DIR)/puppet.conf:
+	RUBYLIB=$(PROTO_DIR)/usr/ruby/$(RUBY_VERSION):$(PROTO_DIR)$(VENDOR_RUBY) \
+	  $(PROTO_DIR)/usr/sbin/puppet agent --genconfig > $@
+
+$(BUILD_DIR)/puppet.xml: $(BUILD_DIR)/puppet.conf
+	-$(RM) $@
+	$(PYTHON) tools/update_smf.py -c $(BUILD_DIR)/puppet.conf \
+	  -s files/puppet.xml -o $@
+
+$(BUILD_DIR)/.smf_updated: $(BUILD_DIR)/puppet.xml
+	$(GDIFF) -q $(BUILD_DIR)/puppet.xml files/puppet.xml > /dev/null 2>&1 || \
+		$(CP) $(BUILD_DIR)/puppet.xml files/puppet.xml
+	$(TOUCH) $@
 
 # Collect and print puppet module manifests for cherry picking into group
 # dependencies as a helper for the package maintainer
@@ -69,6 +95,8 @@
 # --sbindir option not supported by Puppet install.rb
 INSTALL_RB_SBINDIR_OPTION =
 
+INSTALL_RB_OPTIONS += --vardir=/var/cache/puppetlabs
+
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
 PKG_OPTIONS +=	-I $(BUILD_DIR)
@@ -77,9 +105,7 @@
 build::		$(BUILD_NO_ARCH)
 
 # make sure facter and hiera are installed first
-install:	../facter/build/$(MACH)/.installed ../hiera/build/$(MACH)/.installed $(INSTALL_NO_ARCH)
-
-clean::
+install:	../facter/build/$(MACH)/.installed ../hiera/build/$(MACH)/.installed $(INSTALL_NO_ARCH) ext/PuppetAudit.so $(BUILD_DIR)/.smf_updated
 
 # puppet requires the installation of the following rubygems to run
 # the unittests:  rspec rspec-expectations mocha rack rgen
@@ -91,3 +117,9 @@
 REQUIRED_PACKAGES += runtime/ruby-21
 REQUIRED_PACKAGES += library/ruby/hiera
 REQUIRED_PACKAGES += system/management/facter
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/core-os
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += system/network
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet/ext/extconf.rb	Mon Nov 28 16:54:02 2016 -0800
@@ -0,0 +1,5 @@
+require 'mkmf'
+$CPPFLAGS = "-I/usr/include/bsm"
+$LDFLAGS  = "-L/usr/lib"
+$LOCAL_LIBS = "-lbsm"
+create_makefile("PuppetAudit")
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet/ext/puppet_audit.c	Mon Nov 28 16:54:02 2016 -0800
@@ -0,0 +1,169 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ */
+
+/*
+ * Ruby binding for libbsm used by Puppet to record audit events
+ */
+
+#include <ruby.h>
+#include <pwd.h>
+#include <nss_dbdefs.h>
+#include <bsm/adt.h>
+#include <bsm/adt_event.h>
+
+VALUE cPuppetAudit;
+
+VALUE
+audit_new(VALUE class)
+{
+	adt_session_data_t	*ah;
+	VALUE			data;
+
+	if (adt_start_session(&ah, NULL, 0) != 0) {
+		perror("puppet adt_start_session");
+		exit(1);
+	}
+	data = Data_Wrap_Struct(class, 0, 0, ah);
+	rb_obj_call_init(data, 0, 0);
+	return (data);
+}
+
+static VALUE
+audit_init(VALUE self)
+{
+	adt_session_data_t	*ah;
+	adt_termid_t		*tid;
+	struct passwd		pwd, *result;
+	char			*buffer;
+	size_t			size = NSS_BUFLEN_PASSWD;
+
+	Data_Get_Struct(self, adt_session_data_t, ah);
+
+	if (adt_load_hostname(NULL, &tid) != 0) {
+		perror("puppet adt_load_hostname");
+		(void) adt_end_session(ah);
+		exit(1);
+	}
+
+	if ((buffer = malloc(size)) == NULL)
+		exit(1);
+
+	/* set "puppet" as user name and preselection */
+	if (getpwnam_r("puppet", &pwd, buffer, size, &result) != 0) {
+		perror("puppet getpwnam_r(puppet)");
+		(void) adt_end_session(ah);
+		free(buffer);
+		exit(1);
+	}
+
+	if (result == NULL) {
+		perror("puppet getpwnam_r(puppet)");
+		(void) adt_end_session(ah);
+		free(buffer);
+		exit(1);
+	}
+
+	if (adt_set_user(ah, result->pw_uid, result->pw_gid, result->pw_uid,
+	    result->pw_gid, tid, ADT_NEW) != 0) {
+		perror("puppet adt_set_user");
+		free(tid);
+		(void) adt_end_session(ah);
+		free(buffer);
+		exit(1);
+	}
+	free(tid);
+
+	/* set audit context on this process */
+	if (adt_set_proc(ah) != 0) {
+		perror("puppet adt_set_proc");
+		(void) adt_end_session(ah);
+		free(buffer);
+		exit(1);
+	}
+	free(buffer);
+	return (self);
+}
+
+static VALUE
+audit_start(VALUE self)
+{
+	adt_event_data_t	*event;
+	adt_session_data_t	*ah;
+
+	Data_Get_Struct(self, adt_session_data_t, ah);
+
+	if ((event = adt_alloc_event(ah, ADT_puppet_session_start)) == NULL) {
+		perror("adt_alloc_event(ADT_puppet_session_start)");
+		(void) adt_end_session(ah);
+		ah = NULL;
+	} else {
+		if (adt_put_event(event, ADT_SUCCESS, ADT_SUCCESS) != 0) {
+			perror("adt_put_event(ADT_puppet_session_start)");
+		}
+		adt_free_event(event);
+	}
+	return (self);
+}
+
+static VALUE
+audit_stop(VALUE self)
+{
+	adt_event_data_t	*event;
+	adt_session_data_t	*ah;
+
+	Data_Get_Struct(self, adt_session_data_t, ah);
+
+	if ((event = adt_alloc_event(ah, ADT_puppet_session_end)) == NULL) {
+		perror("adt_alloc_event(ADT_puppet_session_end)");
+	} else {
+		if (adt_put_event(event, ADT_SUCCESS, ADT_SUCCESS) != 0) {
+			perror("adt_put_event(ADT_puppet_session_end)");
+		}
+		adt_free_event(event);
+	}
+	return (self);
+}
+
+static VALUE
+audit_teardown(VALUE self)
+{
+	adt_session_data_t	*ah;
+
+	Data_Get_Struct(self, adt_session_data_t, ah);
+
+	(void) adt_end_session(ah);
+	return (self);
+}
+
+void
+Init_PuppetAudit()
+{
+	cPuppetAudit = rb_define_class("PuppetAudit", rb_cObject);
+	rb_define_singleton_method(cPuppetAudit, "new", audit_new, 0);
+	rb_define_method(cPuppetAudit, "initialize", audit_init, 0);
+	rb_define_method(cPuppetAudit, "audit_start", audit_start, 0);
+	rb_define_method(cPuppetAudit, "audit_stop", audit_stop, 0);
+	rb_define_method(cPuppetAudit, "audit_teardown", audit_teardown, 0);
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet/files/auth_attr	Mon Nov 28 16:54:02 2016 -0800
@@ -0,0 +1,2 @@
+solaris.smf.manage.puppet:RO::Manage puppet master states::
+solaris.smf.value.puppet:RO::Change puppet master properties::
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet/files/exec_attr	Mon Nov 28 16:54:02 2016 -0800
@@ -0,0 +1,1 @@
+Puppet Management:solaris:cmd:RO::/usr/sbin/puppet:uid=0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet/files/prof_attr	Mon Nov 28 16:54:02 2016 -0800
@@ -0,0 +1,1 @@
+Puppet Management:RO::Manage the puppet master service:auths=solaris.smf.manage.puppet,solaris.smf.value.puppet
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet/files/puppet.logadm.conf	Mon Nov 28 16:54:02 2016 -0800
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+# Entries to be added to /etc/logadm.conf by svc:/system/logadm-upgrade
+#
+/var/log/puppetlabs/puppet/*.log -C 7 -S 20m -c -z 5 -N
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet/files/puppet.stencil	Mon Nov 28 16:54:02 2016 -0800
@@ -0,0 +1,51 @@
+# WARNING: THIS FILE GENERATED FROM SMF DATA.
+#     DO NOT EDIT THIS FILE.  EDITS WILL BE LOST.
+#
+# See puppet.conf(5) and http://docs.puppet.com/guides/configuring.html
+# for details.
+#
+#
+# service: puppet:main
+# main is the global section used by all commands and services. It can be
+# overridden by the other sections.
+#
+; walk the main instance and extract all properties from the config PG
+$%/(svc:/$%s:(main)/:properties)/ {
+[$%2]
+$%/$%1/config/(.*)/ {
+$%3 = $%{$%1/config/$%3} }
+}
+
+#
+# service: puppet:master
+# master is used by the Puppet master service and the Puppet cert command.
+#
+; walk the master instance and extract all properties from the config PG
+$%/(svc:/$%s:(master)/:properties)/ {
+[$%2]
+$%/$%1/config/(.*)/ {
+$%3 = $%{$%1/config/$%3} }
+}
+
+#
+# service: puppet:agent
+# agent is used by the Puppet agent service.
+#
+; walk the agent instance and extract all properties from the config PG
+$%/(svc:/$%s:(agent)/:properties)/ {
+[$%2]
+$%/$%1/config/(.*)/ {
+$%3 = $%{$%1/config/$%3} }
+}
+
+#
+# service: puppet:user
+# user is used by the Puppet apply command, as well as many of the less common
+# Puppet subcommands.
+#
+; walk the user instance and extract all properties from the config PG
+$%/(svc:/$%s:(user)/:properties)/ {
+[$%2]
+$%/$%1/config/(.*)/ {
+$%3 = $%{$%1/config/$%3} }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet/files/puppet.xml	Mon Nov 28 16:54:02 2016 -0800
@@ -0,0 +1,2053 @@
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<!--
+ CDDL HEADER START
+
+ The contents of this file are subject to the terms of the
+ Common Development and Distribution License (the "License").
+ You may not use this file except in compliance with the License.
+
+ You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ or http://www.opensolaris.org/os/licensing.
+ See the License for the specific language governing permissions
+ and limitations under the License.
+
+ When distributing Covered Code, include this CDDL HEADER in each
+ file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ If applicable, add the following below this CDDL HEADER, with the
+ fields enclosed by brackets "[]" replaced with your own identifying
+ information: Portions Copyright [yyyy] [name of copyright owner]
+
+ CDDL HEADER END
+
+ Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+
+ NOTE:  This service manifest is not editable; its contents will
+ be overwritten by package or patch operations, including
+ operating system upgrade.  Make customizations in a different
+ file.
+-->
+<service_bundle type="manifest" name="puppet">
+  <service name="application/puppet" type="service" version="1">
+    <dependency name="filesystem" grouping="require_all" restart_on="error" type="service">
+      <service_fmri value="svc:/system/filesystem/minimal"/>
+    </dependency>
+    <dependency name="network" grouping="require_all" restart_on="error" type="service">
+      <service_fmri value="svc:/milestone/network"/>
+    </dependency>
+    <dependency name="identity" grouping="require_all" restart_on="error" type="service">
+      <service_fmri value="svc:/system/identity:node"/>
+    </dependency>
+    <dependency name="puppet_self-assembly-complete" grouping="optional_all" restart_on="none">
+      <service_fmri value="svc:/milestone/self-assembly-complete"/>
+    </dependency>
+    <exec_method type="method" name="start" exec=":true" timeout_seconds="60"/>
+    <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60"/>
+    <exec_method type="method" name="refresh" exec=":true" timeout_seconds="0"/>
+    <property_group name="general" type="framework">
+      <!-- to start stop puppet -->
+      <propval name="action_authorization" type="astring" value="solaris.smf.manage.puppet"/>
+      <!-- to change puppet properties -->
+      <propval name="value_authorization" type="astring" value="solaris.smf.value.puppet"/>
+    </property_group>
+    <property_group name="puppet_stencil" type="configfile">
+      <propval name="path" type="astring" value="/etc/puppetlabs/puppet/puppet.conf"/>
+      <propval name="stencil" type="astring" value="puppet.stencil"/>
+      <propval name="mode" type="astring" value="0444"/>
+    </property_group>
+    <instance name="upgrade" enabled="true">
+      <!--
+           The upgrade instance performs migration and cleanup steps if needed
+       -->
+      <exec_method type="method" name="start" exec="/usr/puppetlabs/puppet/bin/upgrade.sh" timeout_seconds="0"/>
+      <exec_method type="method" name="stop" exec=":true" timeout_seconds="0"/>
+      <property_group name="startd" type="framework">
+        <propval name="duration" type="astring" value="transient"/>
+      </property_group>
+      <property_group name="upgrade" type="application">
+        <propval name="4.x" type="boolean" value="false"/>
+      </property_group>
+    </instance>
+    <instance name="main" enabled="false">
+      <!--
+          The main instance exists to hold shared configuration values.
+       -->
+      <property_group name="config" type="application">
+        <propval name="vardir" type="astring" value="/var/cache/puppetlabs"/>
+        <propval name="rundir" type="astring" value="/var/run/puppetlabs"/>
+        <propval name="confdir" type="astring" value="/etc/puppetlabs/puppet"/>
+      </property_group>
+      <exec_method type="method" name="start" exec=":true" timeout_seconds="0"/>
+      <exec_method type="method" name="stop" exec=":true" timeout_seconds="0"/>
+    </instance>
+    <instance name="user" enabled="false">
+      <!--
+          user is used by the Puppet apply command, as well as many of the less
+          common Puppet subcommands.
+       -->
+      <property_group name="config" type="application">
+        <propval name="vardir" type="astring" value="/var/cache/puppetlabs"/>
+        <propval name="rundir" type="astring" value="/var/run/puppetlabs"/>
+        <propval name="confdir" type="astring" value="/etc/puppetlabs/puppet"/>
+      </property_group>
+      <exec_method type="method" name="start" exec=":true" timeout_seconds="0"/>
+      <exec_method type="method" name="stop" exec=":true" timeout_seconds="0"/>
+    </instance>
+    <instance name="master" enabled="false">
+      <exec_method type="method" name="start" exec="/usr/sbin/puppet master --logdest %{config/logdest}" timeout_seconds="600"/>
+      <property_group name="config" type="application">
+        <propval name="logdest" type="astring" value="/var/log/puppetlabs/puppet/puppet-master.log"/>
+      </property_group>
+    </instance>
+    <instance name="agent" enabled="false">
+      <exec_method type="method" name="start" exec="/usr/sbin/puppet agent --logdest %{config/logdest}" timeout_seconds="600"/>
+      <property_group name="config" type="application">
+        <propval name="logdest" type="astring" value="/var/log/puppetlabs/puppet/puppet-agent.log"/>
+      </property_group>
+    </instance>
+    <stability value="Unstable"/>
+    <template>
+      <common_name>
+        <loctext xml:lang="C">Puppet</loctext>
+      </common_name>
+      <documentation>
+        <manpage title="puppet-master" section="8" manpath="/usr/share/man"/>
+      </documentation>
+      <pg_pattern required="false" type="application" name="config">
+        <prop_pattern required="false" type="astring" name="agent_catalog_run_lockfile">
+          <description>
+            <loctext xml:lang="C">
+A lock file to indicate that a puppet agent catalog run is currently in
+progress. The file contains the pid of the process that holds the lock on the
+catalog run.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="agent_disabled_lockfile">
+          <description>
+            <loctext xml:lang="C">
+A lock file to indicate that puppet agent runs have been administratively
+disabled.  File contains a JSON object with state information.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="allow_duplicate_certs">
+          <description>
+            <loctext xml:lang="C">
+Whether to allow a new certificate request to overwrite an existing
+certificate.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="always_cache_features">
+          <description>
+            <loctext xml:lang="C">
+This setting is deprecated and has been replaced by always_retry_plugins.
+Affects how we cache attempts to load Puppet 'features'.  If false, then calls
+to `Puppet.features.&lt;feature&gt;?` will always attempt to load the feature (which
+can be an expensive operation) unless it has already been loaded successfully.
+This makes it possible for a single agent run to, e.g., install a package that
+provides the underlying capabilities for a feature, and then later load that
+feature during the same run (even if the feature had been tested earlier and
+had not been available).  If this setting is set to true, then features will
+only be checked once, and if they are not available, the negative result is
+cached and returned for all subsequent attempts to load the feature.  This
+behavior is almost always appropriate for the server, and can result in a
+significant performance improvement for features that are checked frequently.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="always_retry_plugins">
+          <description>
+            <loctext xml:lang="C">
+Affects how we cache attempts to load Puppet resource types and features.  If
+true, then calls to `Puppet.type.&lt;type&gt;?` `Puppet.feature.&lt;feature&gt;?` will
+always attempt to load the type or feature (which can be an expensive
+operation) unless it has already been loaded successfully. This makes it
+possible for a single agent run to, e.g., install a package that provides the
+underlying capabilities for a type or feature, and then later load that type or
+feature during the same run (even if the type or feature had been tested
+earlier and had not been available).  If this setting is set to false, then
+types and features will only be checked once, and if they are not available,
+the negative result is cached and returned for all subsequent attempts to load
+the type or feature.  This behavior is almost always appropriate for the
+server, and can result in a significant performance improvement for types and
+features that are checked frequently.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="app_management">
+          <description>
+            <loctext xml:lang="C">
+Whether the application management feature is on or off. You must restart
+Puppet Server after changing this setting.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="host" name="archive_file_server">
+          <description>
+            <loctext xml:lang="C">
+During an inspect run, the file bucket server to archive files to if
+archive_files is set.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="archive_files">
+          <description>
+            <loctext xml:lang="C">
+During an inspect run, whether to archive files whose contents are audited to a
+file bucket.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="autoflush">
+          <description>
+            <loctext xml:lang="C">
+Whether log files should always flush to disk.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="autosign">
+          <description>
+            <loctext xml:lang="C">
+Whether (and how) to autosign certificate requests. This setting is only
+relevant on a puppet master acting as a certificate authority (CA).  Valid
+values are true (autosigns all certificate requests; not recommended), false
+(disables autosigning certificates), or the absolute path to a file.  The file
+specified in this setting may be either a **configuration file** or a **custom
+policy executable.** Puppet will automatically determine what it is: If the
+Puppet user (see the `user` setting) can execute the file, it will be treated
+as a policy executable; otherwise, it will be treated as a config file.  If a
+custom policy executable is configured, the CA puppet master will run it every
+time it receives a CSR. The executable will be passed the subject CN of the
+request _as a command line argument,_ and the contents of the CSR in PEM format
+_on stdin._ It should exit with a status of 0 if the cert should be autosigned
+and non-zero if the cert should not be autosigned.  If a certificate request is
+not autosigned, it will persist for review. An admin user can use the `puppet
+cert sign` command to manually sign it, or can delete the request.  For info on
+autosign configuration files, see [the guide to Puppet's config files](http://d
+ocs.puppetlabs.com/puppet/latest/reference/config_about_settings.html).
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="basemodulepath">
+          <description>
+            <loctext xml:lang="C">
+The search path for **global** modules. Should be specified as a list of
+directories separated by the system path separator character. (The POSIX path
+separator is ':', and the Windows path separator is ';'.)  These are the
+modules that will be used by _all_ environments. Note that the `modules`
+directory of the active environment will have priority over any global
+directories. For more info, see
+&lt;https://docs.puppet.com/puppet/latest/reference/environments.html&gt;
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="net_address" name="bindaddress">
+          <description>
+            <loctext xml:lang="C">
+The address a listening server should bind to.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="binder_config">
+          <description>
+            <loctext xml:lang="C">
+The binder configuration file. Puppet reads this file on each request to
+configure the bindings system. If set to nil (the default), a
+$confdir/binder_config.yaml is optionally loaded. If it does not exists, a
+default configuration is used. If the setting :binding_config is specified, it
+must reference a valid and existing yaml file.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="bucketdir">
+          <description>
+            <loctext xml:lang="C">
+Where FileBucket files are stored.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="ca">
+          <description>
+            <loctext xml:lang="C">
+Whether the master should function as a certificate authority.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="ca_name">
+          <description>
+            <loctext xml:lang="C">
+The name to use the Certificate Authority certificate.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="integer" name="ca_port">
+          <description>
+            <loctext xml:lang="C">
+The port to use for the certificate authority.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="host" name="ca_server">
+          <description>
+            <loctext xml:lang="C">
+The server to use for certificate authority requests.  It's a separate server
+because it cannot and does not need to horizontally scale.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="integer" name="ca_ttl">
+          <description>
+            <loctext xml:lang="C">
+The default TTL for new certificates. This setting can be a time interval in
+seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y).
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="cacert">
+          <description>
+            <loctext xml:lang="C">
+The CA certificate.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="cacrl">
+          <description>
+            <loctext xml:lang="C">
+The certificate revocation list (CRL) for the CA. Will be used if present but
+otherwise ignored.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="cadir">
+          <description>
+            <loctext xml:lang="C">
+The root directory for the certificate authority.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="cakey">
+          <description>
+            <loctext xml:lang="C">
+The CA private key.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="capass">
+          <description>
+            <loctext xml:lang="C">
+Where the CA stores the password for the private key.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="caprivatedir">
+          <description>
+            <loctext xml:lang="C">
+Where the CA stores private certificate information.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="capub">
+          <description>
+            <loctext xml:lang="C">
+The CA public key.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="catalog_cache_terminus">
+          <description>
+            <loctext xml:lang="C">
+How to store cached catalogs. Valid values are 'json', 'msgpack' and 'yaml'.
+The agent application defaults to 'json'.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="catalog_terminus">
+          <description>
+            <loctext xml:lang="C">
+Where to get node catalogs.  This is useful to change if, for instance, you'd
+like to pre-compile catalogs and store them in memcached or some other easily-
+accessed store.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="cert_inventory">
+          <description>
+            <loctext xml:lang="C">
+The inventory file. This is a text file to which the CA writes a complete
+listing of all certificates.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="certdir">
+          <description>
+            <loctext xml:lang="C">
+The certificate directory.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="certificate_revocation">
+          <description>
+            <loctext xml:lang="C">
+Whether certificate revocation should be supported by downloading a Certificate
+Revocation List (CRL) to all clients.  If enabled, CA chaining will almost
+definitely not work.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="hostname" name="certname">
+          <description>
+            <loctext xml:lang="C">
+The name to use when handling certificates. When a node requests a certificate
+from the CA puppet master, it uses the value of the `certname` setting as its
+requested Subject CN.  This is the name used when managing a node's permissions
+in [auth.conf](https://docs.puppetlabs.com/puppet/latest/reference/config_file_
+auth.html). In most cases, it is also used as the node's name when matching
+[node definitions](https://docs.puppetlabs.com/puppet/latest/reference/lang_nod
+e_definitions.html) and requesting data from an ENC. (This can be changed with
+the `node_name_value` and `node_name_fact` settings, although you should only
+do so if you have a compelling reason.)  A node's certname is available in
+Puppet manifests as `$trusted['certname']`. (See [Facts and Built-In Variables]
+(https://docs.puppetlabs.com/puppet/latest/reference/lang_facts_and_builtin_var
+s.html) for more details.)  * For best compatibility, you should limit the
+value of `certname` to   only use letters, numbers, periods, underscores, and
+dashes. (That is,   it should match `/A[a-z0-9._-]+Z/`.) * The special value
+`ca` is reserved, and can't be used as the certname   for a normal node.
+Defaults to the node's fully qualified domain name.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="cfacter">
+          <description>
+            <loctext xml:lang="C">
+Whether to enable a pre-Facter 3.0 release of native Facter (distributed as the
+"cfacter" package). This is not necessary if Facter 3.0 or later is installed.
+This setting is deprecated, as Facter 3 is now the default in puppet-agent.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="classfile">
+          <description>
+            <loctext xml:lang="C">
+The file in which puppet agent stores a list of the classes associated with the
+retrieved configuration.  Can be loaded in the separate `puppet` executable
+using the `--loadclasses` option.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="client_datadir">
+          <description>
+            <loctext xml:lang="C">
+The directory in which serialized data is stored on the client.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="clientbucketdir">
+          <description>
+            <loctext xml:lang="C">
+Where FileBucket files are stored locally.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="clientyamldir">
+          <description>
+            <loctext xml:lang="C">
+The directory in which client-side YAML data is stored.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="code">
+          <description>
+            <loctext xml:lang="C">
+Code to parse directly.  This is essentially only used by `puppet`, and should
+only be set if you're writing your own Puppet executable.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="codedir">
+          <description>
+            <loctext xml:lang="C">
+The main Puppet code directory.  The default for this setting is calculated
+based on the user.  If the process is running as root or the user that Puppet
+is supposed to run as, it defaults to a system directory, but if it's running
+as any other user, it defaults to being in the user's home directory.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="color">
+          <description>
+            <loctext xml:lang="C">
+Whether to use colors when logging to the console.  Valid values are `ansi`
+(equivalent to `true`), `html`, and `false`, which produces no color. Defaults
+to false on Windows, as its console does not support ansi colors.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="confdir">
+          <description>
+            <loctext xml:lang="C">
+The main Puppet configuration directory.  The default for this setting is
+calculated based on the user.  If the process is running as root or the user
+that Puppet is supposed to run as, it defaults to a system directory, but if
+it's running as any other user, it defaults to being in the user's home
+directory.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="config">
+          <description>
+            <loctext xml:lang="C">
+The configuration file for the current puppet application.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="config_file_name">
+          <description>
+            <loctext xml:lang="C">
+The name of the puppet config file.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="config_version">
+          <description>
+            <loctext xml:lang="C">
+How to determine the configuration version.  By default, it will be the time
+that the configuration is parsed, but you can provide a shell script to
+override how the version is determined.  The output of this script will be
+added to every log message in the reports, allowing you to correlate changes on
+your hosts to the source version on the server.  Setting a global value for
+config_version in puppet.conf is not allowed (but it can be overridden from the
+commandline). Please set a per-environment value in environment.conf instead.
+For more info, see
+&lt;https://docs.puppet.com/puppet/latest/reference/environments.html&gt;
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="configprint">
+          <description>
+            <loctext xml:lang="C">
+Print the value of a specific configuration setting.  If the name of a setting
+is provided for this, then the value is printed and puppet exits.  Comma-
+separate multiple values.  For a list of all values, specify 'all'.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="integer" name="configtimeout">
+          <description>
+            <loctext xml:lang="C">
+How long the client should wait for the configuration to be retrieved before
+considering it a failure. This setting is deprecated and has been replaced by
+http_connect_timeout and http_read_timeout. This setting can be a time interval
+in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y).
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="csr_attributes">
+          <description>
+            <loctext xml:lang="C">
+An optional file containing custom attributes to add to certificate signing
+requests (CSRs). You should ensure that this file does not exist on your CA
+puppet master; if it does, unwanted certificate extensions may leak into
+certificates created with the `puppet cert generate` command.  If present, this
+file must be a YAML hash containing a `custom_attributes` key and/or an
+`extension_requests` key. The value of each key must be a hash, where each key
+is a valid OID and each value is an object that can be cast to a string.
+Custom attributes can be used by the CA when deciding whether to sign the
+certificate, but are then discarded. Attribute OIDs can be any OID value except
+the standard CSR attributes (i.e. attributes described in RFC 2985 section
+5.4). This is useful for embedding a pre-shared key for autosigning policy
+executables (see the `autosign` setting), often by using the
+`1.2.840.113549.1.9.7` ("challenge password") OID.  Extension requests will be
+permanently embedded in the final certificate. Extension OIDs must be in the
+"ppRegCertExt" (`1.3.6.1.4.1.34380.1.1`) or "ppPrivCertExt"
+(`1.3.6.1.4.1.34380.1.2`) OID arcs. The ppRegCertExt arc is reserved for four
+of the most common pieces of data to embed: `pp_uuid` (`.1`), `pp_instance_id`
+(`.2`), `pp_image_name` (`.3`), and `pp_preshared_key` (`.4`) --- in the YAML
+file, these can be referred to by their short descriptive names instead of
+their full OID. The ppPrivCertExt arc is unregulated, and can be used for site-
+specific extensions.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="csrdir">
+          <description>
+            <loctext xml:lang="C">
+Where the CA stores certificate requests
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="daemonize">
+          <description>
+            <loctext xml:lang="C">
+Whether to send the process into the background.  This defaults to true on
+POSIX systems, and to false on Windows (where Puppet currently cannot
+daemonize).
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="data_binding_terminus">
+          <description>
+            <loctext xml:lang="C">
+Where to retrieve information about data.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="default_file_terminus">
+          <description>
+            <loctext xml:lang="C">
+The default source for files if no server is given in a uri, e.g.
+puppet:///file. The default of `rest` causes the file to be retrieved using the
+`server` setting. When running `apply` the default is `file_server`, causing
+requests to be filled locally.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="default_manifest">
+          <description>
+            <loctext xml:lang="C">
+The default main manifest for directory environments. Any environment that
+doesn't set the `manifest` setting in its `environment.conf` file will use this
+manifest.  This setting's value can be an absolute or relative path. An
+absolute path will make all environments default to the same main manifest; a
+relative path will allow each environment to use its own manifest, and Puppet
+will resolve the path relative to each environment's main directory.  In either
+case, the path can point to a single file or to a directory of manifests to be
+evaluated in alphabetical order.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="default_schedules">
+          <description>
+            <loctext xml:lang="C">
+Boolean; whether to generate the default schedule resources. Setting this to
+false is useful for keeping external report processors clean of skipped
+schedule resources.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="degrade_smf_on_error">
+          <description>
+            <loctext xml:lang="C">
+Whether the SMF service for puppet should be degraded when an error is logged.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="deviceconfig">
+          <description>
+            <loctext xml:lang="C">
+Path to the device config file for puppet device.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="devicedir">
+          <description>
+            <loctext xml:lang="C">
+The root directory of devices' $vardir.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="diff">
+          <description>
+            <loctext xml:lang="C">
+Which diff command to use when printing differences between files. This setting
+has no default value on Windows, as standard `diff` is not available, but
+Puppet can use many third-party diff tools.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="diff_args">
+          <description>
+            <loctext xml:lang="C">
+Which arguments to pass to the diff command when printing differences between
+files. The command to use can be chosen with the `diff` setting.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="digest_algorithm">
+          <description>
+            <loctext xml:lang="C">
+Which digest algorithm to use for file resources and the filebucket. Valid
+values are md5, sha256. Default is md5.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="disable_per_environment_manifest">
+          <description>
+            <loctext xml:lang="C">
+Whether to disallow an environment-specific main manifest. When set to `true`,
+Puppet will use the manifest specified in the `default_manifest` setting for
+all environments. If an environment specifies a different main manifest in its
+`environment.conf` file, catalog requests for that environment will fail with
+an error.  This setting requires `default_manifest` to be set to an absolute
+path.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="disable_warnings">
+          <description>
+            <loctext xml:lang="C">
+A comma-separated list of warning types to suppress. If large numbers of
+warnings are making Puppet's logs too large or difficult to use, you can
+temporarily silence them with this setting.  If you are preparing to upgrade
+Puppet to a new major version, you should re-enable all warnings for a while.
+Valid values for this setting are:  * `deprecations` --- disables deprecation
+warnings. * `undefined_variables` --- disables warnings about non existing
+variables. * `undefined_resources` --- disables warnings about non existing
+resources.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="host" name="dns_alt_names">
+          <description>
+            <loctext xml:lang="C">
+A comma-separated list of alternate DNS names for Puppet Server. These are
+extra hostnames (in addition to its `certname`) that the server is allowed to
+use when serving agents. Puppet checks this setting when automatically
+requesting a certificate for Puppet agent or Puppet Server, and when manually
+generating a certificate with `puppet cert generate`.  In order to handle agent
+requests at a given hostname (like "puppet.example.com"), Puppet Server needs a
+certificate that proves it's allowed to use that name; if a server shows a
+certificate that doesn't include its hostname, Puppet agents will refuse to
+trust it. If you use a single hostname for Puppet traffic but load-balance it
+to multiple Puppet Servers, each of those servers needs to include the official
+hostname in its list of extra names.  **Note:** The list of alternate names is
+locked in when the server's certificate is signed. If you need to change the
+list later, you can't just change this setting; you also need to:  * On the
+server: Stop Puppet Server. * On the CA server: Revoke and clean the server's
+old certificate. (`puppet cert clean &lt;NAME&gt;`) * On the server: Delete the old
+certificate (and any old certificate signing requests)   from the
+[ssldir](https://docs.puppetlabs.com/puppet/latest/reference/dirs_ssldir.html).
+* On the server: Run `puppet agent -t --ca_server &lt;CA HOSTNAME&gt;` to request a
+new certificate * On the CA server: Sign the certificate request, explicitly
+allowing alternate names   (`puppet cert sign --allow-dns-alt-names &lt;NAME&gt;`). *
+On the server: Run `puppet agent -t --ca_server &lt;CA HOSTNAME&gt;` to retrieve the
+cert. * On the server: Start Puppet Server again.  To see all the alternate
+names your servers are using, log into your CA server and run `puppet cert list
+-a`, then check the output for `(alt names: ...)`. Most agent nodes should NOT
+have alternate names; the only certs that should have them are Puppet Server
+nodes that you want other agents to trust.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="document_all">
+          <description>
+            <loctext xml:lang="C">
+Whether to document all resources when using `puppet doc` to generate manifest
+documentation.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="environment">
+          <description>
+            <loctext xml:lang="C">
+The environment Puppet is running in.  For clients (e.g., `puppet agent`) this
+determines the environment itself, which is used to find modules and much more.
+For servers (i.e., `puppet master`) this provides the default environment for
+nodes we know nothing about.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="environment_data_provider">
+          <description>
+            <loctext xml:lang="C">
+The name of a registered environment data provider used when obtaining
+environment specific data. The three built in and registered providers are
+'none' (no data), 'function' (data obtained by calling the function
+'environment::data()') and 'hiera' (data obtained using a data provider
+configured using a hiera.yaml file in root of the environment). Other
+environment data providers may be registered in modules on the module path. For
+such custom data providers see the respective module documentation.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="integer" name="environment_timeout">
+          <description>
+            <loctext xml:lang="C">
+How long the Puppet master should cache data it loads from an environment. This
+setting can be a time interval in seconds (30 or 30s), minutes (30m), hours
+(6h), days (2d), or years (5y). A value of `0` will disable caching. This
+setting can also be set to `unlimited`, which will cache environments until the
+master is restarted or told to refresh the cache.  You should change this
+setting once your Puppet deployment is doing non-trivial work. We chose the
+default value of `0` because it lets new users update their code without any
+extra steps, but it lowers the performance of your Puppet master.  We recommend
+setting this to `unlimited` and explicitly refreshing your Puppet master as
+part of your code deployment process.  * With Puppet Server, you should refresh
+environments by calling the   `environment-cache` API endpoint. See the docs
+for the Puppet Server   administrative API. * With a Rack Puppet master, you
+should restart the web server or the   application server. Passenger lets you
+touch a `restart.txt` file to   refresh an application without restarting
+Apache; see the Passenger docs   for details.  We don't recommend using any
+value other than `0` or `unlimited`, since most Puppet masters use a pool of
+Ruby interpreters which all have their own cache timers. When these timers
+drift out of sync, agents can be served inconsistent catalogs.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="environmentpath">
+          <description>
+            <loctext xml:lang="C">
+A search path for directory environments, as a list of directories separated by
+the system path separator character. (The POSIX path separator is ':', and the
+Windows path separator is ';'.)  This setting must have a value set to enable
+**directory environments.** The recommended value is `$codedir/environments`.
+For more details, see
+&lt;https://docs.puppet.com/puppet/latest/reference/environments.html&gt;
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="evaltrace">
+          <description>
+            <loctext xml:lang="C">
+Whether each resource should log when it is being evaluated.  This allows you
+to interactively see exactly what is being done.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="external_nodes">
+          <description>
+            <loctext xml:lang="C">
+An external command that can produce node information.  The command's output
+must be a YAML dump of a hash, and that hash must have a `classes` key and/or a
+`parameters` key, where `classes` is an array or hash and `parameters` is a
+hash.  For unknown nodes, the command should exit with a non-zero exit code.
+This command makes it straightforward to store your node mapping information in
+other data sources like databases.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="factpath">
+          <description>
+            <loctext xml:lang="C">
+Where Puppet should look for facts.  Multiple directories should be separated
+by the system path separator character. (The POSIX path separator is ':', and
+the Windows path separator is ';'.)
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="facts_terminus">
+          <description>
+            <loctext xml:lang="C">
+The node facts terminus.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="fileserverconfig">
+          <description>
+            <loctext xml:lang="C">
+Where the fileserver configuration is stored.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="integer" name="filetimeout">
+          <description>
+            <loctext xml:lang="C">
+The minimum time to wait between checking for updates in configuration files.
+This timeout determines how quickly Puppet checks whether a file (such as
+manifests or templates) has changed on disk. This setting can be a time
+interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years
+(5y).
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="forge_authorization">
+          <description>
+            <loctext xml:lang="C">
+The authorization key to connect to the Puppet Forge. Leave blank for
+unauthorized or license based connections
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="freeze_main">
+          <description>
+            <loctext xml:lang="C">
+Freezes the 'main' class, disallowing any code to be added to it.  This
+essentially means that you can't have any code outside of a node, class, or
+definition other than in the site manifest.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="genmanifest">
+          <description>
+            <loctext xml:lang="C">
+Whether to just print a manifest to stdout and exit.  Only makes sense when
+specified on the command line as `--genmanifest`.  Takes into account arguments
+specified on the CLI.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="graph">
+          <description>
+            <loctext xml:lang="C">
+Whether to create .dot graph files, which let you visualize the dependency and
+containment relationships in Puppet's catalog. You can load and view these
+files with tools like
+[OmniGraffle](http://www.omnigroup.com/applications/omnigraffle/) (OS X) or
+[graphviz](http://www.graphviz.org/) (multi-platform).  Graph files are created
+when _applying_ a catalog, so this setting should be used on nodes running
+`puppet agent` or `puppet apply`.  The `graphdir` setting determines where
+Puppet will save graphs. Note that we don't save graphs for historical runs;
+Puppet will replace the previous .dot files with new ones every time it applies
+a catalog.  See your graphing software's documentation for details on opening
+.dot files. If you're using GraphViz's `dot` command, you can do a quick PNG
+render with `dot -Tpng &lt;DOT FILE&gt; -o &lt;OUTPUT FILE&gt;`.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="graphdir">
+          <description>
+            <loctext xml:lang="C">
+Where to save .dot-format graphs (when the `graph` setting is enabled).
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="group">
+          <description>
+            <loctext xml:lang="C">
+The group puppet master should run as.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="hiera_config">
+          <description>
+            <loctext xml:lang="C">
+The hiera configuration file. Puppet only reads this file on startup, so you
+must restart the puppet master every time you edit it.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="hostcert">
+          <description>
+            <loctext xml:lang="C">
+Where individual hosts store and look for their certificates.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="hostcrl">
+          <description>
+            <loctext xml:lang="C">
+Where the host's certificate revocation list can be found. This is distinct
+from the certificate authority's CRL.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="hostcsr">
+          <description>
+            <loctext xml:lang="C">
+Where individual hosts store and look for their certificate requests.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="hostprivkey">
+          <description>
+            <loctext xml:lang="C">
+Where individual hosts store and look for their private key.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="hostpubkey">
+          <description>
+            <loctext xml:lang="C">
+Where individual hosts store and look for their public key.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="integer" name="http_connect_timeout">
+          <description>
+            <loctext xml:lang="C">
+The maximum amount of time to wait when establishing an HTTP connection. The
+default value is 2 minutes. This setting can be a time interval in seconds (30
+or 30s), minutes (30m), hours (6h), days (2d), or years (5y).
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="http_debug">
+          <description>
+            <loctext xml:lang="C">
+Whether to write HTTP request and responses to stderr. This should never be
+used in a production environment.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="integer" name="http_keepalive_timeout">
+          <description>
+            <loctext xml:lang="C">
+The maximum amount of time a persistent HTTP connection can remain idle in the
+connection pool, before it is closed.  This timeout should be shorter than the
+keepalive timeout used on the HTTP server, e.g. Apache KeepAliveTimeout
+directive. This setting can be a time interval in seconds (30 or 30s), minutes
+(30m), hours (6h), days (2d), or years (5y).
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="host" name="http_proxy_host">
+          <description>
+            <loctext xml:lang="C">
+The HTTP proxy host to use for outgoing connections.  Note: You may need to use
+a FQDN for the server hostname when using a proxy. Environment variable
+http_proxy or HTTP_PROXY will override this value
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="http_proxy_password">
+          <description>
+            <loctext xml:lang="C">
+The password for the user of an authenticated HTTP proxy. Requires the
+`http_proxy_user` setting.  Note that passwords must be valid when used as part
+of a URL. If a password contains any characters with special meanings in URLs
+(as specified by RFC 3986 ` would become `%23`.)
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="integer" name="http_proxy_port">
+          <description>
+            <loctext xml:lang="C">
+The HTTP proxy port to use for outgoing connections
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="http_proxy_user">
+          <description>
+            <loctext xml:lang="C">
+The user name for an authenticated HTTP proxy. Requires the `http_proxy_host`
+setting.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="http_read_timeout">
+          <description>
+            <loctext xml:lang="C">
+The time to wait for one block to be read from an HTTP connection. If nothing
+is read after the elapsed interval then the connection will be closed. The
+default value is unlimited. This setting can be a time interval in seconds (30
+or 30s), minutes (30m), hours (6h), days (2d), or years (5y).
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="ignorecache">
+          <description>
+            <loctext xml:lang="C">
+This setting has no effect and will be removed in a future Puppet version.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="ignoremissingtypes">
+          <description>
+            <loctext xml:lang="C">
+Skip searching for classes and definitions that were missing during a prior
+compilation. The list of missing objects is maintained per-environment and
+persists until the environment is cleared or the master is restarted.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="ignoreschedules">
+          <description>
+            <loctext xml:lang="C">
+Boolean; whether puppet agent should ignore schedules.  This is useful for
+initial puppet agent runs.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="integer" name="keylength">
+          <description>
+            <loctext xml:lang="C">
+The bit length of keys.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="lastrunfile">
+          <description>
+            <loctext xml:lang="C">
+Where puppet agent stores the last run report summary in yaml format.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="lastrunreport">
+          <description>
+            <loctext xml:lang="C">
+Where puppet agent stores the last run report in yaml format.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="ldapattrs">
+          <description>
+            <loctext xml:lang="C">
+The LDAP attributes to include when querying LDAP for nodes.  All returned
+attributes are set as variables in the top-level scope. Multiple values should
+be comma-separated.  The value 'all' returns all attributes.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="ldapbase">
+          <description>
+            <loctext xml:lang="C">
+The search base for LDAP searches.  It's impossible to provide a meaningful
+default here, although the LDAP libraries might have one already set.
+Generally, it should be the 'ou=Hosts' branch under your main directory.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="ldapclassattrs">
+          <description>
+            <loctext xml:lang="C">
+The LDAP attributes to use to define Puppet classes.  Values should be comma-
+separated.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="ldapparentattr">
+          <description>
+            <loctext xml:lang="C">
+The attribute to use to define the parent node.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="ldappassword">
+          <description>
+            <loctext xml:lang="C">
+The password to use to connect to LDAP.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="integer" name="ldapport">
+          <description>
+            <loctext xml:lang="C">
+The LDAP port.  Only used if `node_terminus` is set to `ldap`.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="host" name="ldapserver">
+          <description>
+            <loctext xml:lang="C">
+The LDAP server.  Only used if `node_terminus` is set to `ldap`.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="ldapssl">
+          <description>
+            <loctext xml:lang="C">
+Whether SSL should be used when searching for nodes. Defaults to false because
+SSL usually requires certificates to be set up on the client side.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="ldapstackedattrs">
+          <description>
+            <loctext xml:lang="C">
+The LDAP attributes that should be stacked to arrays by adding the values in
+all hierarchy elements of the tree.  Values should be comma-separated.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="ldapstring">
+          <description>
+            <loctext xml:lang="C">
+The search string used to find an LDAP node.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="ldaptls">
+          <description>
+            <loctext xml:lang="C">
+Whether TLS should be used when searching for nodes. Defaults to false because
+TLS usually requires certificates to be set up on the client side.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="hostname" name="ldapuser">
+          <description>
+            <loctext xml:lang="C">
+The user to use to connect to LDAP.  Must be specified as a full DN.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="libdir">
+          <description>
+            <loctext xml:lang="C">
+An extra search path for Puppet.  This is only useful for those files that
+Puppet will load on demand, and is only guaranteed to work for those cases.  In
+fact, the autoload mechanism is responsible for making sure this directory is
+in Ruby's search path
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="localcacert">
+          <description>
+            <loctext xml:lang="C">
+Where each client stores the CA certificate.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="log_level">
+          <description>
+            <loctext xml:lang="C">
+Default logging level for messages from Puppet. Allowed values are:  * debug *
+info * notice * warning * err * alert * emerg * crit
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="logdir">
+          <description>
+            <loctext xml:lang="C">
+The directory in which to store log files
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="manage_internal_file_permissions">
+          <description>
+            <loctext xml:lang="C">
+Whether Puppet should manage the owner, group, and mode of files it uses
+internally
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="manifest">
+          <description>
+            <loctext xml:lang="C">
+The entry-point manifest for puppet master. This can be one file or a directory
+of manifests to be evaluated in alphabetical order. Puppet manages this path as
+a directory if one exists or if the path ends with a / or \.  Setting a global
+value for `manifest` in puppet.conf is not allowed (but it can be overridden
+from the commandline). Please use directory environments instead. If you need
+to use something other than the environment's `manifests` directory as the main
+manifest, you can set `manifest` in environment.conf. For more info, see
+&lt;https://docs.puppet.com/puppet/latest/reference/environments.html&gt;
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="masterhttplog">
+          <description>
+            <loctext xml:lang="C">
+Where the puppet master web server saves its access log. This is only used when
+running a WEBrick puppet master. When puppet master is running under a Rack
+server like Passenger, that web server will have its own logging behavior.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="integer" name="masterport">
+          <description>
+            <loctext xml:lang="C">
+The port for puppet master traffic. For puppet master, this is the port to
+listen on; for puppet agent, this is the port to make requests on. Both
+applications use this setting to get the port.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="integer" name="max_deprecations">
+          <description>
+            <loctext xml:lang="C">
+Sets the max number of logged/displayed parser validation deprecation warnings
+in case multiple deprecation warnings have been detected. A value of 0 blocks
+the logging of deprecation warnings.  The count is per manifest.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="integer" name="max_errors">
+          <description>
+            <loctext xml:lang="C">
+Sets the max number of logged/displayed parser validation errors in case
+multiple errors have been detected. A value of 0 is the same as a value of 1; a
+minimum of one error is always raised.  The count is per manifest.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="integer" name="max_warnings">
+          <description>
+            <loctext xml:lang="C">
+Sets the max number of logged/displayed parser validation warnings in case
+multiple warnings have been detected. A value of 0 blocks logging of warnings.
+The count is per manifest.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="integer" name="maximum_uid">
+          <description>
+            <loctext xml:lang="C">
+The maximum allowed UID.  Some platforms use negative UIDs but then ship with
+tools that do not know how to handle signed ints, so the UIDs show up as huge
+numbers that can then not be fed back into the system.  This is a hackish way
+to fail in a slightly more useful way when that happens.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="mkusers">
+          <description>
+            <loctext xml:lang="C">
+Whether to create the necessary user and group that puppet agent will run as.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="module_groups">
+          <description>
+            <loctext xml:lang="C">
+Extra module groups to request from the Puppet Forge. This is an internal
+setting, and users should never change it.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="uri" name="module_repository">
+          <description>
+            <loctext xml:lang="C">
+The module repository
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="module_skeleton_dir">
+          <description>
+            <loctext xml:lang="C">
+The directory which the skeleton for module tool generate is stored.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="module_working_dir">
+          <description>
+            <loctext xml:lang="C">
+The directory into which module tool data is stored
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="modulepath">
+          <description>
+            <loctext xml:lang="C">
+The search path for modules, as a list of directories separated by the system
+path separator character. (The POSIX path separator is ':', and the Windows
+path separator is ';'.)  Setting a global value for `modulepath` in puppet.conf
+is not allowed (but it can be overridden from the commandline). Please use
+directory environments instead. If you need to use something other than the
+default modulepath of `&lt;ACTIVE ENVIRONMENT'S MODULES DIR&gt;:$basemodulepath`, you
+can set `modulepath` in environment.conf. For more info, see
+&lt;https://docs.puppet.com/puppet/latest/reference/environments.html&gt;
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="name">
+          <description>
+            <loctext xml:lang="C">
+The name of the application, if we are running as one.  The default is
+essentially $0 without the path or `.rb`.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="node_cache_terminus">
+          <description>
+            <loctext xml:lang="C">
+How to store cached nodes. Valid values are (none), 'json', 'msgpack', 'yaml'
+or write only yaml ('write_only_yaml'). The master application defaults to
+'write_only_yaml', all others to none.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="node_name">
+          <description>
+            <loctext xml:lang="C">
+How the puppet master determines the client's identity and sets the 'hostname',
+'fqdn' and 'domain' facts for use in the manifest, in particular for
+determining which 'node' statement applies to the client. Possible values are
+'cert' (use the subject's CN in the client's certificate) and 'facter' (use the
+hostname that the client reported in its facts)
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="node_name_fact">
+          <description>
+            <loctext xml:lang="C">
+The fact name used to determine the node name used for all requests the agent
+makes to the master. WARNING: This setting is mutually exclusive with
+node_name_value.  Changing this setting also requires changes to the default
+auth.conf configuration on the Puppet Master.  Please see
+http://links.puppetlabs.com/node_name_fact for more information.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="node_name_value">
+          <description>
+            <loctext xml:lang="C">
+The explicit value used for the node name for all requests the agent makes to
+the master. WARNING: This setting is mutually exclusive with node_name_fact.
+Changing this setting also requires changes to the default auth.conf
+configuration on the Puppet Master.  Please see
+http://links.puppetlabs.com/node_name_value for more information.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="node_terminus">
+          <description>
+            <loctext xml:lang="C">
+Where to find information about nodes.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="noop">
+          <description>
+            <loctext xml:lang="C">
+Whether to apply catalogs in noop mode, which allows Puppet to partially
+simulate a normal run. This setting affects puppet agent and puppet apply.
+When running in noop mode, Puppet will check whether each resource is in sync,
+like it does when running normally. However, if a resource attribute is not in
+the desired state (as declared in the catalog), Puppet will take no action, and
+will instead report the changes it _would_ have made. These simulated changes
+will appear in the report sent to the puppet master, or be shown on the console
+if running puppet agent or puppet apply in the foreground. The simulated
+changes will not send refresh events to any subscribing or notified resources,
+although Puppet will log that a refresh event _would_ have been sent.
+**Important note:** noop) allows you to apply individual resources in noop
+mode, and will override the global value of the `noop` setting. This means a
+resource with `noop =&gt; false` _will_ be changed if necessary, even when running
+puppet agent with `noop = true` or `--noop`. (Conversely, a resource with `noop
+=&gt; true` will only be simulated, even when noop mode is globally disabled.)
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="onetime">
+          <description>
+            <loctext xml:lang="C">
+Perform one configuration run and exit, rather than spawning a long-running
+daemon. This is useful for interactively running puppet agent, or running
+puppet agent from cron.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="ordering">
+          <description>
+            <loctext xml:lang="C">
+How unrelated resources should be ordered when applying a catalog. Allowed
+values are `title-hash`, `manifest`, and `random`. This setting affects puppet
+agent and puppet apply, but not puppet master.  * `manifest` (the default) will
+use the order in which the resources were   declared in their manifest files. *
+`title-hash` (the default in 3.x) will order resources randomly, but   will use
+the same order across runs and across nodes. It is only of   value if you're
+migrating from 3.x and have errors running with   `manifest`. * `random` will
+order resources randomly and change their order with each   run. This can work
+like a fuzzer for shaking out undeclared dependencies.  Regardless of this
+setting's value, Puppet will always obey explicit dependencies set with the
+before/require/notify/subscribe metaparameters and the `-&gt;`/`~&gt;` chaining
+arrows; this setting only affects the relative ordering of _unrelated_
+resources.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="passfile">
+          <description>
+            <loctext xml:lang="C">
+Where puppet agent stores the password for its private key. Generally unused.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="path">
+          <description>
+            <loctext xml:lang="C">
+The shell search path.  Defaults to whatever is inherited from the parent
+process.  This setting can only be set in the `[main]` section of puppet.conf;
+it cannot be set in `[master]`, `[agent]`, or an environment config section.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="pidfile">
+          <description>
+            <loctext xml:lang="C">
+The file containing the PID of a running process. This file is intended to be
+used by service management frameworks and monitoring systems to determine if a
+puppet process is still in the process table.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="plugindest">
+          <description>
+            <loctext xml:lang="C">
+Where Puppet should store plugins that it pulls down from the central server.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="pluginfactdest">
+          <description>
+            <loctext xml:lang="C">
+Where Puppet should store external facts that are being handled by pluginsync
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="pluginfactsource">
+          <description>
+            <loctext xml:lang="C">
+Where to retrieve external facts for pluginsync
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="pluginsignore">
+          <description>
+            <loctext xml:lang="C">
+What files to ignore when pulling down plugins.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="pluginsource">
+          <description>
+            <loctext xml:lang="C">
+From where to retrieve plugins.  The standard Puppet `file` type is used for
+retrieval, so anything that is a valid file source can be used here.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="pluginsync">
+          <description>
+            <loctext xml:lang="C">
+Whether plugins should be synced with the central server. This setting is
+deprecated.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="postrun_command">
+          <description>
+            <loctext xml:lang="C">
+A command to run after every agent run.  If this command returns a non-zero
+return code, the entire Puppet run will be considered to have failed, even
+though it might have performed work during the normal run.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="preferred_serialization_format">
+          <description>
+            <loctext xml:lang="C">
+The preferred means of serializing ruby instances for passing over the wire.
+This won't guarantee that all instances will be serialized using this method,
+since not all classes can be guaranteed to support this format, but it will be
+used for all classes that support it.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="prerun_command">
+          <description>
+            <loctext xml:lang="C">
+A command to run before every agent run.  If this command returns a non-zero
+return code, the entire Puppet run will fail.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="preview_outputdir">
+          <description>
+            <loctext xml:lang="C">
+The directory where catalog previews per node are generated.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="priority">
+          <description>
+            <loctext xml:lang="C">
+The scheduling priority of the process.  Valid values are 'high', 'normal',
+'low', or 'idle', which are mapped to platform-specific values.  The priority
+can also be specified as an integer value and will be passed as is, e.g. -5.
+Puppet must be running as a privileged user in order to increase scheduling
+priority.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="privatedir">
+          <description>
+            <loctext xml:lang="C">
+Where the client stores private certificate information.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="privatekeydir">
+          <description>
+            <loctext xml:lang="C">
+The private key directory.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="profile">
+          <description>
+            <loctext xml:lang="C">
+Whether to enable experimental performance profiling
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="publickeydir">
+          <description>
+            <loctext xml:lang="C">
+The public key directory.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="puppetdlog">
+          <description>
+            <loctext xml:lang="C">
+The fallback log file. This is only used when the `--logdest` option is not
+specified AND Puppet is running on an operating system where both the POSIX
+syslog service and the Windows Event Log are unavailable. (Currently, no
+supported operating systems match that description.)  Despite the name, both
+puppet agent and puppet master will use this file as the fallback logging
+destination.  For control over logging destinations, see the `--logdest`
+command line option in the manual pages for puppet master, puppet agent, and
+puppet apply. You can see man pages by running `puppet &lt;SUBCOMMAND&gt; --help`, or
+read them online at https://docs.puppetlabs.com/puppet/latest/reference/man/.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="report">
+          <description>
+            <loctext xml:lang="C">
+Whether to send reports after every transaction.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="integer" name="report_port">
+          <description>
+            <loctext xml:lang="C">
+The port to communicate with the report_server.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="host" name="report_server">
+          <description>
+            <loctext xml:lang="C">
+The server to send transaction reports to.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="reportdir">
+          <description>
+            <loctext xml:lang="C">
+The directory in which to store reports. Each node gets a separate subdirectory
+in this directory. This setting is only used when the `store` report processor
+is enabled (see the `reports` setting).
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="reports">
+          <description>
+            <loctext xml:lang="C">
+The list of report handlers to use. When using multiple report handlers, their
+names should be comma-separated, with whitespace allowed. (For example,
+`reports = http, store`.)  This setting is relevant to puppet master and puppet
+apply. The puppet master will call these report handlers with the reports it
+receives from agent nodes, and puppet apply will call them with its own report.
+(In all cases, the node applying the catalog must have `report = true`.)  See
+the report reference for information on the built-in report handlers; custom
+report handlers can also be loaded from modules. (Report handlers are loaded
+from the lib directory, at `puppet/reports/NAME.rb`.)
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="uri" name="reporturl">
+          <description>
+            <loctext xml:lang="C">
+The URL that reports should be forwarded to. This setting is only used when the
+`http` report processor is enabled (see the `reports` setting).
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="integer" name="req_bits">
+          <description>
+            <loctext xml:lang="C">
+This setting has no effect and will be removed in a future Puppet version.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="requestdir">
+          <description>
+            <loctext xml:lang="C">
+Where host certificate requests are stored.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="resourcefile">
+          <description>
+            <loctext xml:lang="C">
+The file in which puppet agent stores a list of the resources associated with
+the retrieved configuration.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="rest_authconfig">
+          <description>
+            <loctext xml:lang="C">
+The configuration file that defines the rights to the different rest
+indirections.  This can be used as a fine-grained authorization system for
+`puppet master`.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="route_file">
+          <description>
+            <loctext xml:lang="C">
+The YAML file containing indirector route configuration.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="rundir">
+          <description>
+            <loctext xml:lang="C">
+Where Puppet PID files are kept.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="integer" name="runinterval">
+          <description>
+            <loctext xml:lang="C">
+How often puppet agent applies the catalog. Note that a runinterval of 0 means
+"run continuously" rather than "never run." If you want puppet agent to never
+run, you should start it with the `--no-client` option. This setting can be a
+time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or
+years (5y).
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="serial">
+          <description>
+            <loctext xml:lang="C">
+Where the serial number for certificates is stored.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="host" name="server">
+          <description>
+            <loctext xml:lang="C">
+The puppet master server to which the puppet agent should connect.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="server_datadir">
+          <description>
+            <loctext xml:lang="C">
+The directory in which serialized data is stored, usually in a subdirectory.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="server_list">
+          <description>
+            <loctext xml:lang="C">
+The list of puppet master servers to which the puppet agent should connect, in
+the order that they will be tried.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="show_diff">
+          <description>
+            <loctext xml:lang="C">
+Whether to log and report a contextual diff when files are being replaced. This
+causes partial file contents to pass through Puppet's normal logging and
+reporting system, so this setting should be used with caution if you are
+sending Puppet's reports to an insecure destination. This feature currently
+requires the `diff/lcs` Ruby library.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="signeddir">
+          <description>
+            <loctext xml:lang="C">
+Where the CA stores signed certificates.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="skip_tags">
+          <description>
+            <loctext xml:lang="C">
+Tags to use to filter resources.  If this is set, then only resources not
+tagged with the specified tags will be applied. Values must be comma-separated.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="splay">
+          <description>
+            <loctext xml:lang="C">
+Whether to sleep for a pseudo-random (but consistent) amount of time before a
+run.  For example, without `splay` enabled, your agent checks in every 30
+minutes at :01 and :31 past the hour. After enabling `splay`, the agent will
+wait the pseudorandom sleep time, say eight minutes, and then check in every 30
+minutes, at :09 and :39 after the hour. If you restart the same agent at 12:45
+PM, it will wait its eight minutes, and check in at 12:52 PM, and every 30
+minutes after that, at 1:22 PM, 1:52 PM, and so on. Other agents will have
+different sleep times, and so will check in at different times even if they are
+all restarted at the same time.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="integer" name="splaylimit">
+          <description>
+            <loctext xml:lang="C">
+The maximum time to delay before runs.  Defaults to being the same as the run
+interval. This setting can be a time interval in seconds (30 or 30s), minutes
+(30m), hours (6h), days (2d), or years (5y).
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="host" name="srv_domain">
+          <description>
+            <loctext xml:lang="C">
+The domain which will be queried to find the SRV records of servers to use.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="ssl_client_ca_auth">
+          <description>
+            <loctext xml:lang="C">
+Certificate authorities who issue server certificates.  SSL servers will not be
+considered authentic unless they possess a certificate issued by an authority
+listed in this file.  If this setting has no value then the Puppet master's CA
+certificate (localcacert) will be used.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="ssl_client_header">
+          <description>
+            <loctext xml:lang="C">
+The header containing an authenticated client's SSL DN. This header must be set
+by the proxy to the authenticated client's SSL DN (e.g.,
+`/CN=puppet.puppetlabs.com`).  Puppet will parse out the Common Name (CN) from
+the Distinguished Name (DN) and use the value of the CN field for
+authorization.  Note that the name of the HTTP header gets munged by the web
+server common gateway interface: an `HTTP_` prefix is added, dashes are
+converted to underscores, and all letters are uppercased.  Thus, to use the `X
+-Client-DN` header, this setting should be `HTTP_X_CLIENT_DN`.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="ssl_client_verify_header">
+          <description>
+            <loctext xml:lang="C">
+The header containing the status message of the client verification. This
+header must be set by the proxy to 'SUCCESS' if the client successfully
+authenticated, and anything else otherwise.  Note that the name of the HTTP
+header gets munged by the web server common gateway interface: an `HTTP_`
+prefix is added, dashes are converted to underscores, and all letters are
+uppercased.  Thus, to use the `X-Client-Verify` header, this setting should be
+`HTTP_X_CLIENT_VERIFY`.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="ssl_server_ca_auth">
+          <description>
+            <loctext xml:lang="C">
+Certificate authorities who issue client certificates.  SSL clients will not be
+considered authentic unless they possess a certificate issued by an authority
+listed in this file.  If this setting has no value then the Puppet master's CA
+certificate (localcacert) will be used.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="ssldir">
+          <description>
+            <loctext xml:lang="C">
+Where SSL certificates are kept.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="statedir">
+          <description>
+            <loctext xml:lang="C">
+The directory where Puppet state is stored.  Generally, this directory can be
+removed without causing harm (although it might result in spurious service
+restarts).
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="statefile">
+          <description>
+            <loctext xml:lang="C">
+Where puppet agent and puppet master store state associated with the running
+configuration.  In the case of puppet master, this file reflects the state
+discovered through interacting with clients.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="static_catalogs">
+          <description>
+            <loctext xml:lang="C">
+Whether to compile a static catalog.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="storeconfigs">
+          <description>
+            <loctext xml:lang="C">
+Whether to store each client's configuration, including catalogs, facts, and
+related data. This also enables the import and export of resources in the
+Puppet language - a mechanism for exchange resources between nodes.  By default
+this uses the 'puppetdb' backend.  You can adjust the backend using the
+storeconfigs_backend setting.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="storeconfigs_backend">
+          <description>
+            <loctext xml:lang="C">
+Configure the backend terminus used for StoreConfigs. By default, this uses the
+PuppetDB store, which must be installed and configured before turning on
+StoreConfigs.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="strict">
+          <description>
+            <loctext xml:lang="C">
+The strictness level of puppet. Allowed values are:  * off     - do not perform
+extra validation, do not report * warning - perform extra validation, report as
+warning (default) * error   - perform extra validation, fail with error  The
+strictness level is for both language semantics and runtime evaluation
+validation. In addition to controlling the behavior with this master switch
+some individual warnings may also be controlled by the disable_warnings
+setting.  No new validations will be added to a micro (x.y.z) release, but may
+be added in minor releases (x.y.0). In major releases it expected that most (if
+not all) strictness validation become standard behavior.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="strict_environment_mode">
+          <description>
+            <loctext xml:lang="C">
+Whether the agent specified environment should be considered authoritative,
+causing the run to fail if the retrieved catalog does not match it.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="strict_hostname_checking">
+          <description>
+            <loctext xml:lang="C">
+Whether to only search for the complete hostname as it is in the certificate
+when searching for node information in the catalogs.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="strict_variables">
+          <description>
+            <loctext xml:lang="C">
+Makes the parser raise errors when referencing unknown variables. (This does
+not affect referencing variables that are explicitly set to undef).
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="summarize">
+          <description>
+            <loctext xml:lang="C">
+Whether to print a transaction summary.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="supported_checksum_types">
+          <description>
+            <loctext xml:lang="C">
+Checksum types supported by this agent for use in file resources of a static
+catalog. Values must be comma-separated. Valid types are md5, md5lite, sha256,
+sha256lite, sha1, sha1lite, mtime, ctime.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="syslogfacility">
+          <description>
+            <loctext xml:lang="C">
+What syslog facility to use when logging to syslog. Syslog has a fixed list of
+valid facilities, and you must choose one of those; you cannot just make one
+up.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="tags">
+          <description>
+            <loctext xml:lang="C">
+Tags to use to find resources.  If this is set, then only resources tagged with
+the specified tags will be applied. Values must be comma-separated.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="trace">
+          <description>
+            <loctext xml:lang="C">
+Whether to print stack traces on some errors
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="transactionstorefile">
+          <description>
+            <loctext xml:lang="C">
+Transactional storage file for persisting data between transactions for the
+purposes of infering information (such as corrective_change) on new data
+received.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="trusted_oid_mapping_file">
+          <description>
+            <loctext xml:lang="C">
+File that provides mapping between custom SSL oids and user-friendly names
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="trusted_server_facts">
+          <description>
+            <loctext xml:lang="C">
+When enabled, Puppet creates a protected top-scope variable called
+$server_facts. This variable name can't be re-used in any local scope, and
+can't be overridden by agent-provided facts.  The $server_facts variable is a
+hash, containing server-provided information like the current node's
+environment and the version of Puppet running on the server.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="use_cached_catalog">
+          <description>
+            <loctext xml:lang="C">
+Whether to only use the cached catalog rather than compiling a new catalog on
+every run.  Puppet can be run with this enabled by default and then selectively
+disabled when a recompile is desired.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="use_srv_records">
+          <description>
+            <loctext xml:lang="C">
+Whether the server will search for SRV records in DNS for the current domain.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="boolean" name="usecacheonfailure">
+          <description>
+            <loctext xml:lang="C">
+Whether to use the cached configuration when the remote configuration will not
+compile.  This option is useful for testing new configurations, where you want
+to fix the broken configuration rather than reverting to a known-good one.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="user">
+          <description>
+            <loctext xml:lang="C">
+The user puppet master should run as.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="vardir">
+          <description>
+            <loctext xml:lang="C">
+Where Puppet stores dynamic and growing data.  The default for this setting is
+calculated specially, like `confdir`_.
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="integer" name="waitforcert">
+          <description>
+            <loctext xml:lang="C">
+How frequently puppet agent should ask for a signed certificate.  When starting
+for the first time, puppet agent will submit a certificate signing request
+(CSR) to the server named in the `ca_server` setting (usually the puppet
+master); this may be autosigned, or may need to be approved by a human,
+depending on the CA server's configuration.  Puppet agent cannot apply
+configurations until its approved certificate is available. Since the
+certificate may or may not be available immediately, puppet agent will
+repeatedly try to fetch it at this interval. You can turn off waiting for
+certificates by specifying a time of 0, in which case puppet agent will exit if
+it cannot get a cert. This setting can be a time interval in seconds (30 or
+30s), minutes (30m), hours (6h), days (2d), or years (5y).
+	    </loctext>
+          </description>
+        </prop_pattern>
+        <prop_pattern required="false" type="astring" name="yamldir">
+          <description>
+            <loctext xml:lang="C">
+The directory in which YAML data is stored, usually in a subdirectory.
+	    </loctext>
+          </description>
+        </prop_pattern>
+      </pg_pattern>
+    </template>
+  </service>
+</service_bundle>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet/files/upgrade.sh	Mon Nov 28 16:54:02 2016 -0800
@@ -0,0 +1,53 @@
+#!/usr/bin/bash -e
+. /lib/svc/share/smf_include.sh
+
+# Get Puppet 4 upgrade flag
+PUP4_X=$(/usr/bin/svcprop -p upgrade/4.x $SMF_FMRI)
+
+# Get list of puppet FMRIs
+readarray -t PUPPET_FMRI <<< "$(svcs -H -o fmri application/puppet)"
+
+# Properties to remove if set
+PUPPET_RM_PROP=(
+stringify_facts trusted_node_data allow_variables_with_dashes
+async_storeconfigs binder catalog_format certdnsnames
+certificate_expire_warning couchdb_url dbadapter dbconnections
+dblocation dbmigrate dbname dbpassword dbport dbserver dbsocket
+dbuser dynamicfacts http_compression httplog ignoreimport
+immutable_node_data inventory_port inventory_server
+inventory_terminus legacy_query_parameter_serialization listen
+localconfig manifestdir masterlog parser preview_outputdir puppetport
+queue_source queue_type rails_loglevel railslog report_serialization_format
+reportfrom rrddir rrdinterval sendmail smtphelo smtpport smtpserver
+stringify_facts tagmap templatedir thin_storeconfigs trusted_node_data zlib
+disable_warnings classfile vardir libdir rundir confdir ssldir)
+
+# If additional migrations are needed in the future use a new prop
+# and variable for the steps
+if [ "$PUP4_X" == "true" ] ; then
+  exit $SMF_EXIT_OK
+fi
+if [ "$PUP4_X" == "false" ]; then
+  echo "Updating settings for Puppet 4"
+  echo "Removing Out of Date Configuration Options"
+  for fmri in ${PUPPET_FMRI[@]}
+  do
+    for prop in ${PUPPET_RM_PROP[@]}
+    do
+      printf "%s: " ${fmri}/:properties/config/${prop}
+      # Don't exit on error
+      set +e
+      tmp=$(svcprop ${fmri}/:properties/config/${prop} 2> /dev/null)
+      if [ ! -z ${tmp} ]; then
+        svccfg -s $fmri delprop config/${prop} > /dev/null 2>&1
+        # Reset exit on error
+        print "removed (${tmp})"
+      else
+        print "not present"
+      fi
+      set -e
+    done
+  done
+fi
+svccfg -s $SMF_FMRI setprop upgrade/4.x = true
+svccfg -s $SMF_FMRI refresh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet/files/user_attr	Mon Nov 28 16:54:02 2016 -0800
@@ -0,0 +1,1 @@
+puppet::RO::audit_flags=cusa\:no
--- a/components/ruby/puppet/history	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet/history	Mon Nov 28 16:54:02 2016 -0800
@@ -1,1 +1,2 @@
 system/management/[email protected],5.12-5.12.0.0.0.93.0 system/management/puppet
+system/management/puppet/[email protected] system/management/puppet
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet/patches/0001-Puppet4-paths.patch	Mon Nov 28 16:54:02 2016 -0800
@@ -0,0 +1,321 @@
+From dcd2568b4bcb30962da54a4a12c3d75b3f5da2b5 Mon Sep 17 00:00:00 2001
+From: Shawn Ferry <[email protected]>
+Date: Fri, 9 Dec 2016 15:01:26 -0500
+Subject: [PATCH] Puppet4 paths
+
+Patches not suitable for upstream
+25232171 puppet hard codes new path locations
+25232111 puppet install.rb vardir argument has no impact
+---
+ install.rb                                    |  4 ++--
+ lib/puppet/defaults.rb                        |  2 +-
+ lib/puppet/face/config.rb                     |  2 +-
+ lib/puppet/face/module/install.rb             | 12 ++++++------
+ lib/puppet/face/module/list.rb                | 10 +++++-----
+ lib/puppet/face/module/uninstall.rb           |  4 ++--
+ lib/puppet/provider/package/puppet_gem.rb     |  2 +-
+ lib/puppet/reference/configuration.rb         |  2 +-
+ lib/puppet/util/run_mode.rb                   |  2 +-
+ man/man5/puppet.conf.5                        |  4 ++--
+ man/man8/puppet-config.8                      |  2 +-
+ man/man8/puppet-module.8                      | 14 +++++++-------
+ spec/unit/provider/package/puppet_gem_spec.rb |  2 +-
+ spec/unit/util/run_mode_spec.rb               |  4 ++--
+ 14 files changed, 33 insertions(+), 33 deletions(-)
+
+diff --git a/install.rb b/install.rb
+index bed64d0..dccf787 100755
+--- a/install.rb
++++ b/install.rb
+@@ -178,7 +178,7 @@ def prepare_installation
+     opts.on('--codedir[=OPTIONAL]', 'Installation directory for code files', 'Default /etc/puppetlabs/code') do |codedir|
+       InstallOptions.codedir = codedir
+     end
+-    opts.on('--vardir[=OPTIONAL]', 'Installation directory for var files', 'Default /opt/puppetlabs/puppet/cache') do |vardir|
++    opts.on('--vardir[=OPTIONAL]', 'Installation directory for var files', 'Default /var/puppetlabs/puppet/cache') do |vardir|
+       InstallOptions.vardir = vardir
+     end
+     opts.on('--rundir[=OPTIONAL]', 'Installation directory for state files', 'Default /var/run/puppetlabs') do |rundir|
+@@ -269,7 +269,7 @@ def prepare_installation
+   elsif $operatingsystem == "windows"
+     vardir = File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "cache")
+   else
+-    vardir = "/opt/puppetlabs/puppet/cache"
++    vardir = "/var/puppetlabs/puppet/cache"
+   end
+ 
+   if not InstallOptions.rundir.nil?
+diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
+index fa1aeaa..ff4f210 100644
+--- a/lib/puppet/defaults.rb
++++ b/lib/puppet/defaults.rb
+@@ -1207,7 +1207,7 @@ EOT
+       :desc       => "File that provides mapping between custom SSL oids and user-friendly names"
+     },
+     :basemodulepath => {
+-      :default => "$codedir/modules#{File::PATH_SEPARATOR}/opt/puppetlabs/puppet/modules",
++      :default => "$codedir/modules#{File::PATH_SEPARATOR}/usr/puppetlabs/puppet/modules",
+       :type => :path,
+       :desc => "The search path for **global** modules. Should be specified as a
+         list of directories separated by the system path separator character. (The
+diff --git a/lib/puppet/face/config.rb b/lib/puppet/face/config.rb
+index cd8e746..82a9463 100644
+--- a/lib/puppet/face/config.rb
++++ b/lib/puppet/face/config.rb
+@@ -102,7 +102,7 @@ Puppet::Face.define(:config, '0.0.1') do
+ 
+       Set the vardir for only the agent:
+ 
+-      $ puppet config set vardir /opt/puppetlabs/puppet/cache --section agent
++      $ puppet config set vardir /var/puppetlabs/puppet/cache --section agent
+     EOT
+ 
+     when_invoked do |name, value, options|
+diff --git a/lib/puppet/face/module/install.rb b/lib/puppet/face/module/install.rb
+index d0ab01e..d533547 100644
+--- a/lib/puppet/face/module/install.rb
++++ b/lib/puppet/face/module/install.rb
+@@ -46,20 +46,20 @@ Puppet::Face.define(:module, '1.0.0') do
+ 
+       Install a module into a specific directory:
+ 
+-      $ puppet module install puppetlabs-vcsrepo --target-dir=/opt/puppetlabs/puppet/modules
+-      Preparing to install into /opt/puppetlabs/puppet/modules ...
++      $ puppet module install puppetlabs-vcsrepo --target-dir=/usr/puppetlabs/puppet/modules
++      Preparing to install into /usr/puppetlabs/puppet/modules ...
+       Downloading from https://forgeapi.puppetlabs.com ...
+       Installing -- do not interrupt ...
+-      /opt/puppetlabs/puppet/modules
++      /usr/puppetlabs/puppet/modules
+       └── puppetlabs-vcsrepo (v0.0.4)
+ 
+       Install a module into a specific directory and check for dependencies in other directories:
+ 
+-      $ puppet module install puppetlabs-vcsrepo --target-dir=/opt/puppetlabs/puppet/modules --modulepath /etc/puppetlabs/code/modules
+-      Preparing to install into /opt/puppetlabs/puppet/modules ...
++      $ puppet module install puppetlabs-vcsrepo --target-dir=/usr/puppetlabs/puppet/modules --modulepath /etc/puppetlabs/code/modules
++      Preparing to install into /usr/puppetlabs/puppet/modules ...
+       Downloading from https://forgeapi.puppetlabs.com ...
+       Installing -- do not interrupt ...
+-      /opt/puppetlabs/puppet/modules
++      /usr/puppetlabs/puppet/modules
+       └── puppetlabs-vcsrepo (v0.0.4)
+ 
+       Install a module from a release archive:
+diff --git a/lib/puppet/face/module/list.rb b/lib/puppet/face/module/list.rb
+index cecaf5b..df51df6 100644
+--- a/lib/puppet/face/module/list.rb
++++ b/lib/puppet/face/module/list.rb
+@@ -27,7 +27,7 @@ Puppet::Face.define(:module, '1.0.0') do
+         ├── puppetlabs-mysql (v0.0.1)
+         ├── puppetlabs-sqlite (v0.0.1)
+         └── puppetlabs-stdlib (v2.2.1)
+-        /opt/puppetlabs/puppet/modules (no modules installed)
++        /usr/puppetlabs/puppet/modules (no modules installed)
+ 
+       List installed modules in a tree view:
+ 
+@@ -38,7 +38,7 @@ Puppet::Face.define(:module, '1.0.0') do
+           ├─┬ puppetlabs-mysql (v0.0.1)
+           │ └── bodepd-create_resources (v0.0.1)
+           └── puppetlabs-sqlite (v0.0.1)
+-        /opt/puppetlabs/puppet/modules (no modules installed)
++        /usr/puppetlabs/puppet/modules (no modules installed)
+ 
+       List installed modules from a specified environment:
+ 
+@@ -49,12 +49,12 @@ Puppet::Face.define(:module, '1.0.0') do
+         ├── puppetlabs-mysql (v0.0.1)
+         ├── puppetlabs-sqlite (v0.0.1)
+         └── puppetlabs-stdlib (v2.2.1)
+-        /opt/puppetlabs/puppet/modules (no modules installed)
++        /usr/puppetlabs/puppet/modules (no modules installed)
+ 
+       List installed modules from a specified modulepath:
+ 
+-      $ puppet module list --modulepath /opt/puppetlabs/puppet/modules
+-        /opt/puppetlabs/puppet/modules (no modules installed)
++      $ puppet module list --modulepath /usr/puppetlabs/puppet/modules
++        /usr/puppetlabs/puppet/modules (no modules installed)
+     EOT
+ 
+     when_invoked do |options|
+diff --git a/lib/puppet/face/module/uninstall.rb b/lib/puppet/face/module/uninstall.rb
+index e3c74c5..90c6ed4 100644
+--- a/lib/puppet/face/module/uninstall.rb
++++ b/lib/puppet/face/module/uninstall.rb
+@@ -16,8 +16,8 @@ Puppet::Face.define(:module, '1.0.0') do
+ 
+       Uninstall a module from a specific directory:
+ 
+-      $ puppet module uninstall puppetlabs-ssh --modulepath /opt/puppetlabs/puppet/modules
+-      Removed /opt/puppetlabs/puppet/modules/ssh (v1.0.0)
++      $ puppet module uninstall puppetlabs-ssh --modulepath /usr/puppetlabs/puppet/modules
++      Removed /usr/puppetlabs/puppet/modules/ssh (v1.0.0)
+ 
+       Uninstall a module from a specific environment:
+ 
+diff --git a/lib/puppet/provider/package/puppet_gem.rb b/lib/puppet/provider/package/puppet_gem.rb
+index 8d876a0..86752b7 100644
+--- a/lib/puppet/provider/package/puppet_gem.rb
++++ b/lib/puppet/provider/package/puppet_gem.rb
+@@ -12,6 +12,6 @@ Puppet::Type.type(:package).provide :puppet_gem, :parent => :gem do
+     # sort out the absolute path.
+     commands :gemcmd => "gem"
+   else
+-    commands :gemcmd => "/opt/puppetlabs/puppet/bin/gem"
++    commands :gemcmd => "/usr/bin/gem"
+   end
+ end
+diff --git a/lib/puppet/reference/configuration.rb b/lib/puppet/reference/configuration.rb
+index ac00cab..384077a 100644
+--- a/lib/puppet/reference/configuration.rb
++++ b/lib/puppet/reference/configuration.rb
+@@ -23,7 +23,7 @@ config = Puppet::Util::Reference.newreference(:configuration, :depth => 1, :doc
+     # Now print the data about the item.
+     val = object.default
+     if name.to_s == 'vardir'
+-      val = 'Unix/Linux: /opt/puppetlabs/puppet/cache -- Windows: C:\ProgramData\PuppetLabs\puppet\cache -- Non-root user: ~/.puppetlabs/opt/puppet/cache'
++      val = 'Unix/Linux: /var/puppetlabs/puppet/cache -- Windows: C:\ProgramData\PuppetLabs\puppet\cache -- Non-root user: ~/.puppetlabs/opt/puppet/cache'
+     elsif name.to_s == 'confdir'
+       val = 'Unix/Linux: /etc/puppetlabs/puppet -- Windows: C:\ProgramData\PuppetLabs\puppet\etc -- Non-root user: ~/.puppetlabs/etc/puppet'
+     elsif name.to_s == 'codedir'
+diff --git a/lib/puppet/util/run_mode.rb b/lib/puppet/util/run_mode.rb
+index cf6c461..21968ce 100644
+--- a/lib/puppet/util/run_mode.rb
++++ b/lib/puppet/util/run_mode.rb
+@@ -67,7 +67,7 @@ module Puppet
+       end
+ 
+       def var_dir
+-        which_dir("/opt/puppetlabs/puppet/cache", "~/.puppetlabs/opt/puppet/cache")
++        which_dir("/var/puppetlabs/puppet/cache", "~/.puppetlabs/opt/puppet/cache")
+       end
+ 
+       def run_dir
+diff --git a/man/man5/puppet.conf.5 b/man/man5/puppet.conf.5
+index ff23f71..414cfc8 100644
+--- a/man/man5/puppet.conf.5
++++ b/man/man5/puppet.conf.5
+@@ -121,7 +121,7 @@ The search path for \fBglobal\fR modules\. Should be specified as a list of dire
+ These are the modules that will be used by \fIall\fR environments\. Note that the \fBmodules\fR directory of the active environment will have priority over any global directories\. For more info, see https://docs\.puppetlabs\.com/puppet/latest/reference/environments\.html
+ .
+ .IP "\(bu" 4
+-\fIDefault\fR: $codedir/modules:/opt/puppetlabs/puppet/modules
++\fIDefault\fR: $codedir/modules:/usr/puppetlabs/puppet/modules
+ .
+ .IP "" 0
+ .
+@@ -1730,7 +1730,7 @@ The user puppet master should run as\.
+ Where Puppet stores dynamic and growing data\. The default for this setting is calculated specially, like \fBconfdir\fR_\.
+ .
+ .IP "\(bu" 4
+-\fIDefault\fR: /opt/puppetlabs/puppet/cache
++\fIDefault\fR: /var/puppetlabs/puppet/cache
+ .
+ .IP "" 0
+ .
+diff --git a/man/man8/puppet-config.8 b/man/man8/puppet-config.8
+index 35310d0..5df37e4 100644
+--- a/man/man8/puppet-config.8
++++ b/man/man8/puppet-config.8
+@@ -111,7 +111,7 @@ $ puppet config set rundir /var/run/puppetlabs
+ Set the vardir for only the agent:
+ .
+ .P
+-$ puppet config set vardir /opt/puppetlabs/puppet/cache \-\-section agent
++$ puppet config set vardir /var/puppetlabs/puppet/cache \-\-section agent
+ .
+ .SH "COPYRIGHT AND LICENSE"
+ Copyright 2011 by Puppet Labs Apache 2 license; see COPYING
+diff --git a/man/man8/puppet-module.8 b/man/man8/puppet-module.8
+index 62591fe..b5b05a5 100644
+--- a/man/man8/puppet-module.8
++++ b/man/man8/puppet-module.8
+@@ -340,13 +340,13 @@ $ puppet module install puppetlabs\-vcsrepo \-v 0\.0\.4 Preparing to install int
+ Install a module into a specific directory:
+ .
+ .P
+-$ puppet module install puppetlabs\-vcsrepo \-\-target\-dir=/opt/puppetlabs/puppet/modules Preparing to install into /opt/puppetlabs/puppet/modules \.\.\. Downloading from https://forgeapi\.puppetlabs\.com \.\.\. Installing \-\- do not interrupt \.\.\. /opt/puppetlabs/puppet/modules └── puppetlabs\-vcsrepo (v0\.0\.4)
++$ puppet module install puppetlabs\-vcsrepo \-\-target\-dir=/usr/puppetlabs/puppet/modules Preparing to install into /usr/puppetlabs/puppet/modules \.\.\. Downloading from https://forgeapi\.puppetlabs\.com \.\.\. Installing \-\- do not interrupt \.\.\. /usr/puppetlabs/puppet/modules └── puppetlabs\-vcsrepo (v0\.0\.4)
+ .
+ .P
+ Install a module into a specific directory and check for dependencies in other directories:
+ .
+ .P
+-$ puppet module install puppetlabs\-vcsrepo \-\-target\-dir=/opt/puppetlabs/puppet/modules \-\-modulepath /etc/puppetlabs/code/modules Preparing to install into /opt/puppetlabs/puppet/modules \.\.\. Downloading from https://forgeapi\.puppetlabs\.com \.\.\. Installing \-\- do not interrupt \.\.\. /opt/puppetlabs/puppet/modules └── puppetlabs\-vcsrepo (v0\.0\.4)
++$ puppet module install puppetlabs\-vcsrepo \-\-target\-dir=/usr/puppetlabs/puppet/modules \-\-modulepath /etc/puppetlabs/code/modules Preparing to install into /usr/puppetlabs/puppet/modules \.\.\. Downloading from https://forgeapi\.puppetlabs\.com \.\.\. Installing \-\- do not interrupt \.\.\. /usr/puppetlabs/puppet/modules └── puppetlabs\-vcsrepo (v0\.0\.4)
+ .
+ .P
+ Install a module from a release archive:
+@@ -367,25 +367,25 @@ $ puppet module install puppetlabs\-vcsrepo\-0\.0\.4\.tar\.gz \-\-ignore\-depend
+ List installed modules:
+ .
+ .P
+-$ puppet module list /etc/puppetlabs/code/modules ├── bodepd\-create_resources (v0\.0\.1) ├── puppetlabs\-bacula (v0\.0\.2) ├── puppetlabs\-mysql (v0\.0\.1) ├── puppetlabs\-sqlite (v0\.0\.1) └── puppetlabs\-stdlib (v2\.2\.1) /opt/puppetlabs/puppet/modules (no modules installed)
++$ puppet module list /etc/puppetlabs/code/modules ├── bodepd\-create_resources (v0\.0\.1) ├── puppetlabs\-bacula (v0\.0\.2) ├── puppetlabs\-mysql (v0\.0\.1) ├── puppetlabs\-sqlite (v0\.0\.1) └── puppetlabs\-stdlib (v2\.2\.1) /usr/puppetlabs/puppet/modules (no modules installed)
+ .
+ .P
+ List installed modules in a tree view:
+ .
+ .P
+-$ puppet module list \-\-tree /etc/puppetlabs/code/modules └─┬ puppetlabs\-bacula (v0\.0\.2) ├── puppetlabs\-stdlib (v2\.2\.1) ├─┬ puppetlabs\-mysql (v0\.0\.1) │ └── bodepd\-create_resources (v0\.0\.1) └── puppetlabs\-sqlite (v0\.0\.1) /opt/puppetlabs/puppet/modules (no modules installed)
++$ puppet module list \-\-tree /etc/puppetlabs/code/modules └─┬ puppetlabs\-bacula (v0\.0\.2) ├── puppetlabs\-stdlib (v2\.2\.1) ├─┬ puppetlabs\-mysql (v0\.0\.1) │ └── bodepd\-create_resources (v0\.0\.1) └── puppetlabs\-sqlite (v0\.0\.1) /usr/puppetlabs/puppet/modules (no modules installed)
+ .
+ .P
+ List installed modules from a specified environment:
+ .
+ .P
+-$ puppet module list \-\-environment production /etc/puppetlabs/code/modules ├── bodepd\-create_resources (v0\.0\.1) ├── puppetlabs\-bacula (v0\.0\.2) ├── puppetlabs\-mysql (v0\.0\.1) ├── puppetlabs\-sqlite (v0\.0\.1) └── puppetlabs\-stdlib (v2\.2\.1) /opt/puppetlabs/puppet/modules (no modules installed)
++$ puppet module list \-\-environment production /etc/puppetlabs/code/modules ├── bodepd\-create_resources (v0\.0\.1) ├── puppetlabs\-bacula (v0\.0\.2) ├── puppetlabs\-mysql (v0\.0\.1) ├── puppetlabs\-sqlite (v0\.0\.1) └── puppetlabs\-stdlib (v2\.2\.1) /usr/puppetlabs/puppet/modules (no modules installed)
+ .
+ .P
+ List installed modules from a specified modulepath:
+ .
+ .P
+-$ puppet module list \-\-modulepath /opt/puppetlabs/puppet/modules /opt/puppetlabs/puppet/modules (no modules installed)
++$ puppet module list \-\-modulepath /usr/puppetlabs/puppet/modules /usr/puppetlabs/puppet/modules (no modules installed)
+ .
+ .P
+ \fBsearch\fR
+@@ -409,7 +409,7 @@ $ puppet module uninstall puppetlabs\-ssh Removed /etc/puppetlabs/code/modules/s
+ Uninstall a module from a specific directory:
+ .
+ .P
+-$ puppet module uninstall puppetlabs\-ssh \-\-modulepath /opt/puppetlabs/puppet/modules Removed /opt/puppetlabs/puppet/modules/ssh (v1\.0\.0)
++$ puppet module uninstall puppetlabs\-ssh \-\-modulepath /usr/puppetlabs/puppet/modules Removed /usr/puppetlabs/puppet/modules/ssh (v1\.0\.0)
+ .
+ .P
+ Uninstall a module from a specific environment:
+diff --git a/spec/unit/provider/package/puppet_gem_spec.rb b/spec/unit/provider/package/puppet_gem_spec.rb
+index 017e0c4..2817701 100644
+--- a/spec/unit/provider/package/puppet_gem_spec.rb
++++ b/spec/unit/provider/package/puppet_gem_spec.rb
+@@ -20,7 +20,7 @@ describe provider_class do
+   if Puppet.features.microsoft_windows?
+     let(:puppet_gem) { 'gem' }
+   else
+-    let(:puppet_gem) { '/opt/puppetlabs/puppet/bin/gem' }
++    let(:puppet_gem) { '/usr/bin/gem' }
+   end
+ 
+   before :each do
+diff --git a/spec/unit/util/run_mode_spec.rb b/spec/unit/util/run_mode_spec.rb
+index bd7759a..657d40c 100644
+--- a/spec/unit/util/run_mode_spec.rb
++++ b/spec/unit/util/run_mode_spec.rb
+@@ -67,8 +67,8 @@ describe Puppet::Util::RunMode do
+     end
+ 
+     describe "#var_dir" do
+-      it "has vardir /opt/puppetlabs/puppet/cache when run as root" do
+-        as_root { expect(@run_mode.var_dir).to eq(File.expand_path('/opt/puppetlabs/puppet/cache')) }
++      it "has vardir /var/puppetlabs/puppet/cache when run as root" do
++        as_root { expect(@run_mode.var_dir).to eq(File.expand_path('/var/puppetlabs/puppet/cache')) }
+       end
+ 
+       it "has vardir ~/.puppetlabs/opt/puppet/cache when run as non-root" do
+-- 
+2.9.3 (Apple Git-75)
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet/patches/puppet-00-PUP-6793-s12pkg.patch	Mon Nov 28 16:54:02 2016 -0800
@@ -0,0 +1,16 @@
+Merged with upstream PUP 4.9.0
+(PUP-6793) pkg provider should be default for Solaris 12
+https://tickets.puppetlabs.com/browse/PUP-6793
+
+diff --git a/lib/puppet/provider/package/pkg.rb b/lib/puppet/provider/package/pkg.rb
+--- a/lib/puppet/provider/package/pkg.rb
++++ b/lib/puppet/provider/package/pkg.rb
+@@ -23,7 +23,7 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
+ 
+   confine :osfamily => :solaris
+ 
+-  defaultfor :osfamily => :solaris, :kernelrelease => '5.11'
++  defaultfor :osfamily => :solaris, :kernelrelease => ['5.11', '5.12']
+ 
+   def self.instances
+     pkg(:list, '-Hv').split("\n").map{|l| new(parse_line(l))}
--- a/components/ruby/puppet/patches/puppet-00-s12pkg.patch	Wed Jan 11 15:24:27 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-Oracle customization - non upstream patch
-Add Solaris 12 to the pkg(5) pkg provider
-
---- puppet-3.8.6/lib/puppet/provider/package/pkg.rb.orig        2016-04-19 13:58:08.682627507 -0700
-+++ puppet-3.8.6/lib/puppet/provider/package/pkg.rb     2016-04-19 14:01:27.178984250 -0700
-@@ -1,3 +1,7 @@
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
-+
- require 'puppet/provider/package'
- 
- Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package do
-@@ -23,7 +27,7 @@
- 
-   confine :osfamily => :solaris
- 
--  defaultfor :osfamily => :solaris, :kernelrelease => '5.11'
-+  defaultfor :osfamily => :solaris, :kernelrelease => ['5.11', '5.12']
- 
-   def self.instances
-     pkg(:list, '-H').split("\n").map{|l| new(parse_line(l))}
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet/patches/puppet-01-PUP-6795-installrb-nogzip-manpage.patch	Mon Nov 28 16:54:02 2016 -0800
@@ -0,0 +1,21 @@
+Merged with upstream PUP 4.9.0
+(PUP-6795) Solaris does not support gzipped man pages
+https://tickets.puppetlabs.com/browse/PUP-6795
+
+--- a/install.rb
++++ b/install.rb
+@@ -108,9 +108,12 @@ def do_man(man, strip = 'man/')
+     FileUtils.makedirs(om, {:mode => 0755, :verbose => true})
+     FileUtils.chmod(0755, om)
+     FileUtils.install(mf, omf, {:mode => 0644, :preserve => true, :verbose => true})
+-    gzip = %x{which gzip}
+-    gzip.chomp!
+-    %x{#{gzip} -f #{omf}}
++    # Solaris does not support gzipped man pages
++    unless Facter["os"].value["family"] == "Solaris"
++      gzip = %x{which gzip}
++      gzip.chomp!
++      %x{#{gzip} -f #{omf}}
++    end
+   end
+ end
--- a/components/ruby/puppet/patches/puppet-01-installrb-nogzip-manpage.patch	Wed Jan 11 15:24:27 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-Oracle customization - non upstream patch
-Prevent puppet's build script from gzipping the manpages.  Our version
-of man doesn't understand manpages with a .gz extension
-
---- puppet-3.8.6/install.rb.orig        2016-04-19 14:11:02.962068933 -0700
-+++ puppet-3.8.6/install.rb     2016-04-19 14:12:16.560008346 -0700
-@@ -1,4 +1,7 @@
- #! /usr/bin/env ruby
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
- #--
- # Copyright 2004 Austin Ziegler <[email protected]>
- #   Install utility. Based on the original installation script for rdoc by the
-@@ -135,9 +138,6 @@
-       FileUtils.chmod(0755, om)
-       FileUtils.install(mf, omf, {:mode => 0644, :preserve => true, :verbose => true})
-     end
--    gzip = %x{which gzip}
--    gzip.chomp!
--    %x{#{gzip} -f #{omf}}
-   end
- end
-
--- a/components/ruby/puppet/patches/puppet-02-zone-type.patch	Wed Jan 11 15:24:27 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,299 +0,0 @@
-Enhance the zone type to configure zones using a zonecfg export file format.
-Enhance the output of the puppet resource zone.
-
---- puppet-3.8.6/lib/puppet/type/zone.rb.orig	2016-04-19 14:14:44.165798357 -0700
-+++ puppet-3.8.6/lib/puppet/type/zone.rb	2016-04-19 14:15:24.531067353 -0700
-@@ -1,10 +1,9 @@
--require 'puppet/property/list'
--Puppet::Type.newtype(:zone) do
--  @doc = "Manages Solaris zones.
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
- 
--**Autorequires:** If Puppet is managing the directory specified as the root of
--the zone's filesystem (with the `path` attribute), the zone resource will
--autorequire that directory."
-+Puppet::Type.newtype(:zone) do
-+  @doc = "Manages Solaris zones."
- 
- module Puppet::Zone
-   class StateMachine
-@@ -59,7 +58,7 @@
- 
-     def self.fsm
-       return @fsm if @fsm
--      @fsm = Puppet::Zone::StateMachine.new
-+      @fsm = Puppet::Zone::StateMachine.new 
-     end
- 
-     def self.alias_state(values)
-@@ -75,7 +74,7 @@
- 
-     # This is seq value because the order of declaration is important.
-     # i.e we go linearly from :absent -> :configured -> :installed -> :running
--    seqvalue :absent, :down => :destroy
-+    seqvalue :absent, :down => :unconfigure
-     seqvalue :configured, :up => :configure, :down => :uninstall
-     seqvalue :installed, :up => :install, :down => :stop
-     seqvalue :running, :up => :start
-@@ -104,10 +103,10 @@
-         sleep 1
-       end
-       provider.send(method)
--      provider.flush()
-     end
- 
-     def sync
-+
-       method = nil
-       direction = up? ? :up : :down
- 
-@@ -131,132 +130,34 @@
- 
-   newparam(:name) do
-     desc "The name of the zone."
--
-     isnamevar
-   end
- 
--  newparam(:id) do
--    desc "The numerical ID of the zone.  This number is autogenerated
--      and cannot be changed."
--  end
--
--  newparam(:clone) do
--    desc "Instead of installing the zone, clone it from another zone.
--      If the zone root resides on a zfs file system, a snapshot will be
--      used to create the clone; if it resides on a ufs filesystem, a copy of the
--      zone will be used. The zone from which you clone must not be running."
--  end
--
--  newproperty(:ip, :parent => Puppet::Property::List) do
--    require 'ipaddr'
--
--    desc "The IP address of the zone.  IP addresses **must** be specified
--      with an interface, and may optionally be specified with a default router
--      (sometimes called a defrouter). The interface, IP address, and default
--      router should be separated by colons to form a complete IP address string.
--      For example: `bge0:192.168.178.200` would be a valid IP address string
--      without a default router, and `bge0:192.168.178.200:192.168.178.1` adds a
--      default router to it.
--
--      For zones with multiple interfaces, the value of this attribute should be
--      an array of IP address strings (each of which must include an interface
--      and may include a default router)."
--
--    # The default action of list should is to lst.join(' '). By specifying
--    # @should, we ensure the should remains an array. If we override should, we
--    # should also override insync?() -- property/list.rb
--    def should
--      @should
--    end
--
--    # overridden so that we match with self.should
--    def insync?(is)
--      is = [] if !is || is == :absent
--      is.sort == self.should.sort
--    end
--  end
--
--  newproperty(:iptype) do
--    desc "The IP stack type of the zone."
--    defaultto :shared
--    newvalue :shared
--    newvalue :exclusive
--  end
--
--  newproperty(:autoboot, :boolean => true) do
--    desc "Whether the zone should automatically boot."
--    defaultto true
--    newvalues(:true, :false)
--  end
--
--  newproperty(:path) do
--    desc "The root of the zone's filesystem.  Must be a fully qualified
--      file name.  If you include `%s` in the path, then it will be
--      replaced with the zone's name.  Currently, you cannot use
--      Puppet to move a zone. Consequently this is a readonly property."
--
--    validate do |value|
--      raise ArgumentError, "The zone base must be fully qualified" unless value =~ /^\//
--    end
--
--    munge do |value|
--      if value =~ /%s/
--        value % @resource[:name]
--      else
--        value
--      end
--    end
-+  newparam(:config_profile) do
-+    desc "Path to the config_profile to use to configure a solaris zone.
-+          This is set when providing a sysconfig profile instead of running the
-+	  sysconfig SCI tool on first boot of the zone."
-   end
- 
--  newproperty(:pool) do
--    desc "The resource pool for this zone."
-+  newparam(:zonecfg_export) do
-+    desc "Contains the zone configuration information. This can be passed in
-+    in the form of a file generated by the zonecfg command, in the form
-+    of a template, or a string."
-   end
- 
--  newproperty(:shares) do
--    desc "Number of FSS CPU shares allocated to the zone."
-+  newparam(:archive) do
-+    desc "The archive file containing an archived zone."
-   end
- 
--  newproperty(:dataset, :parent => Puppet::Property::List ) do
--    desc "The list of datasets delegated to the non-global zone from the
--      global zone.  All datasets must be zfs filesystem names which are
--      different from the mountpoint."
--
--    def should
--      @should
--    end
--
--    # overridden so that we match with self.should
--    def insync?(is)
--      is = [] if !is || is == :absent
--      is.sort == self.should.sort
--    end
--
--    validate do |value|
--      unless value !~ /^\//
--        raise ArgumentError, "Datasets must be the name of a zfs filesystem"
--      end
--    end
-+  newparam(:archived_zonename) do
-+    desc "The archived zone to configure and install"
-   end
--
--  newproperty(:inherit, :parent => Puppet::Property::List) do
--    desc "The list of directories that the zone inherits from the global
--      zone.  All directories must be fully qualified."
--
--    def should
--      @should
--    end
--
--    # overridden so that we match with self.should
--    def insync?(is)
--      is = [] if !is || is == :absent
--      is.sort == self.should.sort
--    end
--
--    validate do |value|
--      unless value =~ /^\//
--        raise ArgumentError, "Inherited filesystems must be fully qualified"
--      end
--    end
-+  
-+  newparam(:clone) do
-+    desc "Instead of installing the zone, clone it from another zone.
-+      If the zone root resides on a zfs file system, a snapshot will be
-+      used to create the clone; if it resides on a ufs filesystem, a copy of the
-+      zone will be used. The zone from which you clone must not be running."
-   end
- 
-   # Specify the sysidcfg file.  This is pretty hackish, because it's
-@@ -293,70 +194,11 @@
-       so Puppet only checks for it at that time.}
-   end
- 
--  newparam(:create_args) do
--    desc "Arguments to the `zonecfg` create command.  This can be used to create branded zones."
--  end
--
-   newparam(:install_args) do
-     desc "Arguments to the `zoneadm` install command.  This can be used to create branded zones."
-   end
- 
--  newparam(:realhostname) do
--    desc "The actual hostname of the zone."
--  end
--
--  # If Puppet is also managing the base dir or its parent dir, list them
--  # both as prerequisites.
--  autorequire(:file) do
--    if @parameters.include? :path
--      [@parameters[:path].value, ::File.dirname(@parameters[:path].value)]
--    else
--      nil
--    end
--  end
--
--  # If Puppet is also managing the zfs filesystem which is the zone dataset
--  # then list it as a prerequisite.  Zpool's get autorequired by the zfs
--  # type.  We just need to autorequire the dataset zfs itself as the zfs type
--  # will autorequire all of the zfs parents and zpool.
--  autorequire(:zfs) do
--    # Check if we have datasets in our zone configuration and autorequire each dataset
--    self[:dataset] if @parameters.include? :dataset
--  end
--
--  def validate_ip(ip, name)
--    IPAddr.new(ip) if ip
--  rescue ArgumentError
--    self.fail Puppet::Error, "'#{ip}' is an invalid #{name}", $!
--  end
--
--  def validate_exclusive(interface, address, router)
--    return if !interface.nil? and address.nil?
--    self.fail "only interface may be specified when using exclusive IP stack: #{interface}:#{address}"
--  end
--  def validate_shared(interface, address, router)
--    self.fail "ip must contain interface name and ip address separated by a \":\"" if interface.nil? or address.nil?
--    [address, router].each do |ip|
--      validate_ip(address, "IP address") unless ip.nil?
--    end
--  end
--
--  validate do
--    return unless self[:ip]
--    # self[:ip] reflects the type passed from proeprty:ip.should. If we
--    # override it and pass @should, then we get an array here back.
--    self[:ip].each do |ip|
--      interface, address, router = ip.split(':')
--      if self[:iptype] == :shared
--        validate_shared(interface, address, router)
--      else
--        validate_exclusive(interface, address, router)
--      end
--    end
--  end
--
-   def retrieve
--    provider.flush
-     hash = provider.properties
-     return setstatus(hash) unless hash.nil? or hash[:ensure] == :absent
-     # Return all properties as absent.
-@@ -379,4 +221,25 @@
-     end
-     prophash
-   end
-+
-+  # Private Properties
-+  # The following properties are used in conjunction with the "puppet resource zone"
-+  # output. They are valid properties for configuring a zone.
-+
-+  newproperty(:id) do
-+    desc "The numerical ID of the zone.  This number is autogenerated
-+    and cannot be changed."
-+  end
-+
-+  newproperty(:zonepath) do
-+    desc "The path to zone's file system."
-+  end
-+
-+  newproperty(:iptype) do
-+    desc "Displays exclusive or shared instance of IP."
-+  end
-+
-+  newproperty(:brand) do
-+    desc "The zone's brand type"
-+  end
- end
--- a/components/ruby/puppet/patches/puppet-03-zone-provider.patch	Wed Jan 11 15:24:27 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,370 +0,0 @@
-Enhance the zone provider to configure zones using a zonecfg export file format.
-Enhance the output of puppet resource zone, and fix zone clone functionality, which omitted '-c'.
-
---- puppet-3.8.6/lib/puppet/provider/zone/solaris.rb.orig	2016-04-19 14:19:58.810028057 -0700
-+++ puppet-3.8.6/lib/puppet/provider/zone/solaris.rb	2016-04-19 14:20:32.183269425 -0700
-@@ -1,5 +1,9 @@
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
-+
- Puppet::Type.type(:zone).provide(:solaris) do
--  desc "Provider for Solaris Zones."
-+  desc "Provider for Solaris zones."
- 
-   commands :adm => "/usr/sbin/zoneadm", :cfg => "/usr/sbin/zonecfg"
-   defaultfor :osfamily => :solaris
-@@ -8,129 +12,84 @@
- 
-   # Convert the output of a list into a hash
-   def self.line2hash(line)
--    fields = [:id, :name, :ensure, :path, :uuid, :brand, :iptype]
-+    fields = [:id, :name, :ensure, :zonepath, :uuid, :brand, :iptype ]
-     properties = Hash[fields.zip(line.split(':'))]
- 
--    del_id = [:brand, :uuid]
-+    del_id = [:id, :uuid]
-+
-     # Configured but not installed zones do not have IDs
-     del_id << :id if properties[:id] == "-"
-     del_id.each { |p| properties.delete(p) }
--
-     properties[:ensure] = properties[:ensure].intern
--    properties[:iptype] = 'exclusive' if properties[:iptype] == 'excl'
- 
-     properties
-   end
- 
-+
-   def self.instances
-     adm(:list, "-cp").split("\n").collect do |line|
-       new(line2hash(line))
-     end
-   end
- 
--  def multi_conf(name, should, &action)
--    has = properties[name]
--    has = [] if !has || has == :absent
--    rms = has - should
--    adds = should - has
--    (rms.map{|o| action.call(:rm,o)} + adds.map{|o| action.call(:add,o)}).join("\n")
--  end
--
--  def self.def_prop(var, str)
--    define_method('%s_conf' % var.to_s) do |v|
--      str % v
--    end
--    define_method('%s=' % var.to_s) do |v|
--      setconfig self.send( ('%s_conf'% var).intern, v)
--    end
--  end
-+  
-+  # Read in the zone configuration parameters and properties and
-+  # perform the zone configuration. Options are cloning the zone,
-+  # which needs a zonecfg_export file, configuring an archive, which
-+  # takes optional zonecfg_export and archived_zonename parameters,
-+  # or performing a zone configuration, which requires a zonecfg_export
-+  # file or string.
-+  def configure
- 
--  def self.def_multiprop(var, &conf)
--    define_method(var.to_s) do |v|
--      o = properties[var]
--      return '' if o.nil? or o == :absent
--      o.join(' ')
--    end
--    define_method('%s=' % var.to_s) do |v|
--      setconfig self.send( ('%s_conf'% var).intern, v)
--    end
--    define_method('%s_conf' % var.to_s) do |v|
--      multi_conf(var, v, &conf)
-+    if @resource[:archive].nil? && @resource[:zonecfg_export].nil?
-+      raise Puppet::Error, "No configuration resource is defined."
-     end
--  end
- 
--  def_prop :iptype, "set ip-type=%s"
--  def_prop :autoboot, "set autoboot=%s"
--  def_prop :path, "set zonepath=%s"
--  def_prop :pool, "set pool=%s"
--  def_prop :shares, "add rctl\nset name=zone.cpu-shares\nadd value (priv=privileged,limit=%s,action=none)\nend"
--
--  def_multiprop :ip do |action, str|
--    interface, ip, defrouter = str.split(':')
--    case action
--    when :add
--      cmd = ["add net"]
--      cmd << "set physical=#{interface}" if interface
--      cmd << "set address=#{ip}" if ip
--      cmd << "set defrouter=#{defrouter}" if defrouter
--      cmd << "end"
--      cmd.join("\n")
--    when :rm
--      if ip
--        "remove net address=#{ip}"
--      elsif interface
--        "remove net physical=#{interface}"
--      else
--        raise ArgumentError, "can not remove network based on default router"
-+    command = String.new
-+    if @resource[:clone]
-+      if !@resource[:zonecfg_export]
-+        raise Puppet::Error, "A zone configuration must be defined to
-+        clone a zone."
-+      end
-+      command = "#{command(:cfg)} -z #{@resource[:name]} -f #{@resource[:zonecfg_export]}"
-+    else
-+      unless @resource[:zonecfg_export].nil? || @resource[:zonecfg_export].empty?
-+        begin
-+          file = File.open(@resource[:zonecfg_export], "rb")
-+          str = file.read.gsub(/[\n]\n*\s*/, "; ")
-+        rescue
-+          str = @resource[:zonecfg_export].gsub(/[\n]\n*\s*/, "; ")
-+        ensure
-+          file.close unless file.nil?
-+        end
-+        @property_hash.clear
-       end
--    else self.fail action
--    end
--  end
- 
--  def_multiprop :dataset do |action, str|
--    case action
--    when :add; ['add dataset',"set name=#{str}",'end'].join("\n")
--    when :rm; "remove dataset name=#{str}"
--    else self.fail action
--    end
--  end
-+      unless @resource[:archive].nil? || @resource[:archive].empty?
-+        if !str.nil?
-+          command = "#{command(:cfg)} -z #{@resource[:name]} \'create -a #{@resource[:archive]};#{str}\'"
-+        else
-+          command = "#{command(:cfg)} -z #{@resource[:name]} create -a #{@resource[:archive]} "
-+        end
-+        if @resource[:archived_zonename]
-+          command << " -z #{@resource[:archived_zonename]}"
-+        end
-+      end
- 
--  def_multiprop :inherit do |action, str|
--    case action
--    when :add; ['add inherit-pkg-dir', "set dir=#{str}",'end'].join("\n")
--    when :rm; "remove inherit-pkg-dir dir=#{str}"
--    else self.fail action
-+      if !@resource[:zonecfg_export].nil? && @resource[:archive].nil?
-+        command = "#{command(:cfg)} -z #{@resource[:name]} \'#{str}\'"
-+      end
-     end
--  end
- 
--  def my_properties
--    [:path, :iptype, :autoboot, :pool, :shares, :ip, :dataset, :inherit]
--  end
--
--  # Perform all of our configuration steps.
--  def configure
--    self.fail "Path is required" unless @resource[:path]
--    arr = ["create -b #{@resource[:create_args]}"]
--
--    # Then perform all of our configuration steps.  It's annoying
--    # that we need this much internal info on the resource.
--    self.resource.properties.each do |property|
--      next unless my_properties.include? property.name
--      method = (property.name.to_s + '_conf').intern
--      arr << self.send(method ,@resource[property.name]) unless property.safe_insync?(properties[property.name])
-+    if command
-+      r = exec_cmd(:cmd => command)
-     end
--    setconfig(arr.join("\n"))
-   end
- 
-   def destroy
-     zonecfg :delete, "-F"
-   end
- 
--  def add_cmd(cmd)
--    @cmds = [] if @cmds.nil?
--    @cmds << cmd
--  end
--
-   def exists?
-     properties[:ensure] != :absent
-   end
-@@ -138,31 +97,35 @@
-   # We cannot use the execpipe in util because the pipe is not opened in
-   # read/write mode.
-   def exec_cmd(var)
--    # In bash, the exit value of the last command is the exit value of the
--    # entire pipeline
--    out = execute("echo \"#{var[:input]}\" | #{var[:cmd]}", :failonfail => false, :combine => true)
--    st = $?.exitstatus
--    {:out => out, :exit => st}
--  end
--
--  # Clear out the cached values.
--  def flush
--    return if @cmds.nil? || @cmds.empty?
--    str = (@cmds << "commit" << "exit").join("\n")
--    @cmds = []
--    @property_hash.clear
--
--    command = "#{command(:cfg)} -z #{@resource[:name]} -f -"
--    r = exec_cmd(:cmd => command, :input => str)
--    if r[:exit] != 0 or r[:out] =~ /not allowed/
--      raise ArgumentError, "Failed to apply configuration"
-+    if var[:input]
-+    	execute("echo \"#{var[:input]}\" | #{var[:cmd]}", :failonfail => true, :combine => true)
-+    else
-+        execute("#{var[:cmd]}", :failonfail => true, :combine => true)
-     end
-   end
- 
-+
-   def install(dummy_argument=:work_arround_for_ruby_GC_bug)
-+    if ['5.11', '5.12'].include? Facter.value(:kernelrelease)
-+       if !@resource[:install_args] and @resource[:config_profile]
-+         @resource[:install_args] = " -c " + @resource[:config_profile]
-+       elsif !@resource[:install_args] and @resource[:archive]
-+         @resource[:install_args] = " -a " + @resource[:archive]
-+	     if @resource[:archived_zonename]
-+	       @resource[:install_args] << " -z " + @resource[:archived_zonename]
-+	     end
-+       elsif @resource[:config_profile]
-+	     @resource[:install_args] << " -c " + @resource[:config_profile]
-+       end
-+    end
-+       
-     if @resource[:clone] # TODO: add support for "-s snapshot"
--      zoneadm :clone, @resource[:clone]
--    elsif @resource[:install_args]
-+      if @resource[:config_profile]
-+        zoneadm :clone, @resource[:install_args].split(" "), @resource[:clone]
-+      else
-+        zoneadm :clone, @resource[:clone]
-+      end
-+    elsif @resource[:install_args] 
-       zoneadm :install, @resource[:install_args].split(" ")
-     else
-       zoneadm :install
-@@ -182,11 +145,12 @@
-       end
-     end
-     @property_hash.dup
-+    
-   end
- 
-   # We need a way to test whether a zone is in process.  Our 'ensure'
-   # property models the static states, but we need to handle the temporary ones.
--  def processing?
-+  def processing?  
-     hash = status
-     return false unless hash
-     ["incomplete", "ready", "shutting_down"].include? hash[:ensure]
-@@ -214,7 +178,6 @@
-   #
-   def getconfig
-     output = zonecfg :info
--
-     name = nil
-     current = nil
-     hash = {}
-@@ -244,14 +207,9 @@
-     hash
-   end
- 
--  # Execute a configuration string.  Can't be private because it's called
--  # by the properties.
--  def setconfig(str)
--    add_cmd str
--  end
--
-   def start
-     # Check the sysidcfg stuff
-+   if ['5.10'].include? Facter.value(:kernelrelease)
-     if cfg = @resource[:sysidcfg]
-       self.fail "Path is required" unless @resource[:path]
-       zoneetc = File.join(@resource[:path], "root", "etc")
-@@ -272,7 +230,9 @@
-         end
-       end
-     end
-+   end
- 
-+    # Boots the zone
-     zoneadm :boot
-   end
- 
-@@ -285,64 +245,35 @@
-     end
- 
-     main = self.class.line2hash(output.chomp)
--
--    # Now add in the configuration information
--    config_status.each do |name, value|
--      main[name] = value
--    end
--
-     main
-   end
- 
-   def ready
-+    # Prepare the zone
-     zoneadm :ready
-   end
- 
-   def stop
--    zoneadm :halt
-+     # Shutdown the zone
-+     zoneadm :halt
-   end
-+  
- 
-   def unconfigure
-+    # Unconfigure and delete the zone
-     zonecfg :delete, "-F"
-   end
- 
-   def uninstall
-+    # Uninstall the zone
-     zoneadm :uninstall, "-F"
-   end
- 
-   private
- 
--  # Turn the results of getconfig into status information.
--  def config_status
--    config = getconfig
--    result = {}
--
--    result[:autoboot] = config[:autoboot] ? config[:autoboot].intern : :true
--    result[:pool] = config[:pool]
--    result[:shares] = config[:shares]
--    if dir = config["inherit-pkg-dir"]
--      result[:inherit] = dir.collect { |dirs| dirs[:dir] }
--    end
--    if datasets = config["dataset"]
--      result[:dataset] = datasets.collect { |dataset| dataset[:name] }
--    end
--    result[:iptype] = config[:'ip-type'] if config[:'ip-type']
--    if net = config["net"]
--      result[:ip] = net.collect do |params|
--        if params[:defrouter]
--          "#{params[:physical]}:#{params[:address]}:#{params[:defrouter]}"
--        elsif params[:address]
--          "#{params[:physical]}:#{params[:address]}"
--        else
--          params[:physical]
--        end
--      end
--    end
--
--    result
--  end
--
-   def zoneadm(*cmd)
-+    # Execute the zoneadm command with the arguments
-+    # provided
-     adm("-z", @resource[:name], *cmd)
-   rescue Puppet::ExecutionFailure => detail
-     self.fail Puppet::Error, "Could not #{cmd[0]} zone: #{detail}", detail
--- a/components/ruby/puppet/patches/puppet-04-agent-auditing.patch	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet/patches/puppet-04-agent-auditing.patch	Mon Nov 28 16:54:02 2016 -0800
@@ -1,39 +1,45 @@
+Not submitted to upstream
 Add auditing support to agent execution
 
---- puppet-3.8.6/lib/puppet/agent.rb.orig	2016-04-19 14:23:14.948120246 -0700
-+++ puppet-3.8.6/lib/puppet/agent.rb	2016-04-19 14:24:09.178244630 -0700
-@@ -1,4 +1,11 @@
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
-+
+diff --git a/lib/puppet/agent.rb b/lib/puppet/agent.rb
+--- a/lib/puppet/agent.rb
++++ b/lib/puppet/agent.rb
+@@ -1,5 +1,8 @@
  require 'puppet/application'
+ require 'puppet/error'
 +if Facter.value(:osfamily) == "Solaris"
 +  require 'PuppetAudit'
 +end
  
  # A general class for triggering a run of another
  # class.
-@@ -37,6 +44,11 @@
-       return
-     end
+@@ -30,11 +33,15 @@ class Puppet::Agent
  
+   # Perform a run with our client.
+   def run(client_options = {})
++    # Always start an audit record
 +    if Facter.value(:osfamily) == "Solaris"
 +        audit_handle = PuppetAudit.new
 +        audit_handle.audit_start
 +    end
-+
+     if disabled?
+       Puppet.notice "Skipping run of #{client_class}; administratively disabled (Reason: '#{disable_message}');\nUse 'puppet agent --enable' to re-enable."
+       return
+     end
+-
      result = nil
      block_run = Puppet::Application.controlled_run do
        splay client_options.fetch :splay, Puppet[:splay]
-@@ -52,6 +64,10 @@
-           end
-         end
-       end
-+      if Facter.value(:osfamily) == "Solaris"
-+          audit_handle.audit_stop
-+          audit_handle.audit_teardown
-+      end
-       true
+@@ -55,6 +62,12 @@ class Puppet::Agent
      end
      Puppet.notice "Shutdown/restart in progress (#{Puppet::Application.run_status.inspect}); skipping run" unless block_run
+     result
++  ensure
++    # Always stop an audit record
++    if Facter.value(:osfamily) == "Solaris"
++        audit_handle.audit_stop
++        audit_handle.audit_teardown
++    end
+   end
+ 
+   def stopping?
--- a/components/ruby/puppet/patches/puppet-05-apply-auditing.patch	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet/patches/puppet-05-apply-auditing.patch	Mon Nov 28 16:54:02 2016 -0800
@@ -1,5 +1,8 @@
---- puppet-3.8.3/lib/puppet/application/apply.rb.orig	2015-09-21 14:46:28.000000000 -0700
-+++ puppet-3.8.3/lib/puppet/application/apply.rb	2015-12-01 10:21:17.911069347 -0800
+Not submitted to upstream
+
+diff --git a/lib/puppet/application/apply.rb b/lib/puppet/application/apply.rb
+--- a/lib/puppet/application/apply.rb
++++ b/lib/puppet/application/apply.rb
 @@ -1,6 +1,9 @@
  require 'puppet/application'
  require 'puppet/configurer'
@@ -9,30 +12,29 @@
 +end
  
  class Puppet::Application::Apply < Puppet::Application
- 
-@@ -217,6 +220,12 @@
-       end
+   require 'puppet/util/splayer'
+@@ -182,6 +185,12 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
+   end
  
-       begin
-+        # configure auditing on Solaris
-+        if Facter.value(:osfamily) == "Solaris"
-+            audit_handle = PuppetAudit.new
-+            audit_handle.audit_start
-+        end
+   def main
++    # configure auditing on Solaris
++    if Facter.value(:osfamily) == "Solaris"
++        audit_handle = PuppetAudit.new
++        audit_handle.audit_start
++    end
 +
-         # Compile our catalog
-         starttime = Time.now
-         catalog = Puppet::Resource::Catalog.indirection.find(node.name, :use_node => node)
-@@ -245,6 +254,12 @@
-       rescue => detail
-         Puppet.log_exception(detail)
-         exit(1)
-+      ensure
-+        # clean up auditing records on Solaris
-+        if Facter.value(:osfamily) == "Solaris"
-+          audit_handle.audit_stop
-+          audit_handle.audit_teardown
-+        end
-       end
+     # Set our code or file to use.
+     if options[:code] or command_line.args.length == 0
+       Puppet[:code] = options[:code] || STDIN.read
+@@ -287,6 +296,11 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
      end
  
+   ensure
++    # clean up auditing records on Solaris
++    if Facter.value(:osfamily) == "Solaris"
++      audit_handle.audit_stop
++      audit_handle.audit_teardown
++    end
+     if @profiler
+       Puppet::Util::Profiler.remove_profiler(@profiler)
+       @profiler.shutdown
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet/patches/puppet-06-PUP-6797-provider-smf.patch	Mon Nov 28 16:54:02 2016 -0800
@@ -0,0 +1,21 @@
+Merged with upstream PUP 4.9.0
+(PUP-6797) service should check for smf service first
+https://tickets.puppetlabs.com/browse/PUP-6797
+
+--- puppet-3.8.6/lib/puppet/provider/service/smf.rb.orig	2016-04-19 14:26:51.367951573 -0700
++++ puppet-3.8.6/lib/puppet/provider/service/smf.rb	2016-04-19 14:27:31.661139999 -0700
+@@ -129,6 +129,14 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
+       return
+     end
+
++    # Check to see if the service exists
++    cmd = Array[command(:svccfg), "select", @resource[:name]]
++    output = Puppet::Util::Execution.execute(
++        cmd, :combine => true, :failonfail => false)
++    if $CHILD_STATUS.exitstatus != 0
++      info output
++    end
++
+     begin
+       # get the current state and the next state, and if the next
+       # state is set (i.e. not "-") use it for state comparison
--- a/components/ruby/puppet/patches/puppet-06-provider-smf.patch	Wed Jan 11 15:24:27 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-Add check for existence of smf service
-
---- puppet-3.8.6/lib/puppet/provider/service/smf.rb.orig	2016-04-19 14:26:51.367951573 -0700
-+++ puppet-3.8.6/lib/puppet/provider/service/smf.rb	2016-04-19 14:27:31.661139999 -0700
-@@ -1,3 +1,7 @@
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
-+
- # Solaris 10 SMF-style services.
- Puppet::Type.type(:service).provide :smf, :parent => :base do
-   desc <<-EOT
-@@ -80,9 +84,18 @@
-       return
-     end
- 
-+    # get the current state and the next state, and if the next
-+    # state is set (i.e. not "-") use it for state comparison
-+
-+    # Check to see if the service exists
-+    cmd = Array[command(:svccfg), "select", @resource[:name]]
-+    output = Puppet::Util::Execution.execute(
-+        cmd, :combine => true, :failonfail => false)
-+    if $CHILD_STATUS.exitstatus != 0
-+      info output
-+    end
-+
-     begin
--      # get the current state and the next state, and if the next
--      # state is set (i.e. not "-") use it for state comparison
-       states = svcs("-H", "-o", "state,nstate", @resource[:name]).chomp.split
-       state = states[1] == "-" ? states[0] : states[1]
-     rescue Puppet::ExecutionFailure
--- a/components/ruby/puppet/patches/puppet-07-PUP-2641.patch	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet/patches/puppet-07-PUP-2641.patch	Mon Nov 28 16:54:02 2016 -0800
@@ -4,14 +4,6 @@
 
 --- puppet-3.8.6/lib/puppet/application/describe.rb.orig	2016-04-19 14:29:00.513107441 -0700
 +++ puppet-3.8.6/lib/puppet/application/describe.rb	2016-04-19 14:29:42.599397493 -0700
-@@ -1,3 +1,7 @@
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
-+
- require 'puppet/application'
- 
- class Formatter
 @@ -70,13 +74,8 @@
      }.each do |name|
        type = @types[name]
--- a/components/ruby/puppet/patches/puppet-08-PUP-2509.patch	Wed Jan 11 15:24:27 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-In-house patch to fix upstream bug PUP-2509
-https://tickets.puppetlabs.com/browse/PUP-2509
-Patch has been submitted upstream but not yet accepted.
-
---- puppet-3.8.6/lib/puppet/provider/service/smf.rb.orig	2016-04-19 14:53:01.233681735 -0700
-+++ puppet-3.8.6/lib/puppet/provider/service/smf.rb	2016-04-19 14:53:31.762390677 -0700
-@@ -36,7 +36,7 @@
-   end
- 
-   def self.instances
--   svcs.split("\n").select{|l| l !~ /^legacy_run/ }.collect do |line|
-+   svcs("-H").split("\n").select{|l| l !~ /^legacy_run/ }.collect do |line|
-      state,stime,fmri = line.split(/\s+/)
-      status =  case state
-                when /online/; :running
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet/patches/puppet-09-PUP-6796-role-shell.patch	Mon Nov 28 16:54:02 2016 -0800
@@ -0,0 +1,39 @@
+Merged with upstream PUP 4.9.0
+(PUP-6796) Support setting/checking shell in user_role_add
+https://tickets.puppetlabs.com/browse/PUP-6796
+
+diff --git a/lib/puppet/provider/user/user_role_add.rb b/lib/puppet/provider/user/user_role_add.rb
+--- a/lib/puppet/provider/user/user_role_add.rb
++++ b/lib/puppet/provider/user/user_role_add.rb
+@@ -12,6 +12,7 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
+   options :home, :flag => "-d", :method => :dir
+   options :comment, :method => :gecos
+   options :groups, :flag => "-G"
++  options :shell, :flag => "-s"
+   options :roles, :flag => "-R"
+   options :auths, :flag => "-A"
+   options :profiles, :flag => "-P"
+@@ -26,8 +27,23 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
+     value !~ /\s/
+   end
+ 
++  def shell=(value)
++    check_valid_shell
++    set("shell", value)
++  end
++
+   has_features :manages_homedir, :allows_duplicates, :manages_solaris_rbac, :manages_passwords, :manages_password_age, :manages_shell
+ 
++
++  def check_valid_shell
++    unless File.exists?(@resource.should(:shell))
++      raise(Puppet::Error, "Shell #{@resource.should(:shell)} must exist")
++    end
++    unless File.executable?(@resource.should(:shell).to_s)
++      raise(Puppet::Error, "Shell #{@resource.should(:shell)} must be executable")
++    end
++  end
++
+   #must override this to hand the keyvalue pairs
+   def add_properties
+     cmd = []
--- a/components/ruby/puppet/patches/puppet-09-role-shell.patch	Wed Jan 11 15:24:27 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
---- puppet-3.8.6/lib/puppet/provider/user/user_role_add.rb.orig	2016-04-19 14:32:54.606087591 -0700
-+++ puppet-3.8.6/lib/puppet/provider/user/user_role_add.rb	2016-04-19 14:34:04.451831050 -0700
-@@ -1,3 +1,7 @@
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
-+
- require 'puppet/util'
- require 'puppet/util/user_attr'
- require 'date'
-@@ -12,6 +16,7 @@
-   options :home, :flag => "-d", :method => :dir
-   options :comment, :method => :gecos
-   options :groups, :flag => "-G"
-+  options :shell, :flag => "-s"
-   options :roles, :flag => "-R"
-   options :auths, :flag => "-A"
-   options :profiles, :flag => "-P"
-@@ -26,7 +31,22 @@
-     value !~ /\s/
-   end
- 
-+  def shell=(value)
-+    check_valid_shell
-+    set("shell", value)
-+  end
-+
-   has_features :manages_homedir, :allows_duplicates, :manages_solaris_rbac, :manages_passwords, :manages_password_age, :manages_shell
-+  
-+
-+  def check_valid_shell
-+    unless File.exists?(@resource.should(:shell))
-+      raise(Puppet::Error, "Shell #{@resource.should(:shell)} must exist")
-+    end
-+    unless File.executable?(@resource.should(:shell).to_s)
-+      raise(Puppet::Error, "Shell #{@resource.should(:shell)} must be executable")
-+    end
-+  end
- 
-   #must override this to hand the keyvalue pairs
-   def add_properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet/patches/puppet-10-PUP-6792-smf-recursive-enable.patch	Mon Nov 28 16:54:02 2016 -0800
@@ -0,0 +1,17 @@
+Merged with upstream PUP 4.9.0
+(PUP-6792) SMF should recursively enable services
+https://tickets.puppetlabs.com/browse/PUP-6792
+
+diff --git a/lib/puppet/provider/service/smf.rb b/lib/puppet/provider/service/smf.rb
+index be04a95..d006ca7 100644
+--- a/lib/puppet/provider/service/smf.rb
++++ b/lib/puppet/provider/service/smf.rb
+@@ -80,7 +80,7 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
+     when :maintenance, :degraded
+       [command(:adm), :clear, @resource[:name]]
+     else
+-      [command(:adm), :enable, "-s", @resource[:name]]
++      [command(:adm), :enable, "-rs", @resource[:name]]
+     end
+   end
+ 
--- a/components/ruby/puppet/patches/puppet-10-smf-recursive-enable.patch	Wed Jan 11 15:24:27 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-Patch to make svcadm enable default to using the -r flag.  This patch
-has not yet been submitted upstream.
-
---- puppet-3.8.6/lib/puppet/provider/service/smf.rb.orig        2016-04-19 14:53:31.762390677 -0700
-+++ puppet-3.8.6/lib/puppet/provider/service/smf.rb     2016-04-19 14:56:32.596751150 -0700
-@@ -74,7 +74,7 @@
-     when :maintenance
-       [command(:adm), :clear, @resource[:name]]
-     else
--      [command(:adm), :enable, "-s", @resource[:name]]
-+      [command(:adm), :enable, "-rs", @resource[:name]]
-     end
-   end
--- a/components/ruby/puppet/patches/puppet-11-smf-degraded.patch	Wed Jan 11 15:24:27 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-Add support for degraded state in smf and remove unused variable stime.
-Submitted upstream as PUP-6095
-
---- puppet-3.8.6/lib/puppet/provider/service/smf.rb.orig	2016-04-19 14:56:32.596751150 -0700
-+++ puppet-3.8.6/lib/puppet/provider/service/smf.rb	2016-04-19 14:59:32.495860166 -0700
-@@ -36,11 +36,12 @@
-   end
- 
-   def self.instances
--   svcs("-H").split("\n").select{|l| l !~ /^legacy_run/ }.collect do |line|
--     state,stime,fmri = line.split(/\s+/)
-+   svcs("-H", "-o", "state,fmri" ).split("\n").select{|l| l !~ /^legacy_run/ }.collect do |line|
-+     state,fmri = line.split(/\s+/)
-      status =  case state
-                when /online/; :running
-                when /maintenance/; :maintenance
-+               when /degraded/; :degraded
-                else :stopped
-                end
-      new({:name => fmri, :ensure => status})
-@@ -71,7 +72,7 @@
-   def startcmd
-     self.setupservice
-     case self.status
--    when :maintenance
-+    when :maintenance, :degraded
-       [command(:adm), :clear, @resource[:name]]
-     else
-       [command(:adm), :enable, "-rs", @resource[:name]]
-@@ -112,6 +113,8 @@
-       return :stopped
-     when "maintenance"
-       return :maintenance
-+    when "degraded"
-+      return :degraded
-     when "legacy_run"
-       raise Puppet::Error,
-         "Cannot manage legacy services through SMF"
--- a/components/ruby/puppet/patches/puppet-12-pkg-provider-latest.patch	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet/patches/puppet-12-pkg-provider-latest.patch	Mon Nov 28 16:54:02 2016 -0800
@@ -5,18 +5,19 @@
 Wildcards support
 install_options/uninstall_options features support
 
---- puppet-3.8.6/lib/puppet/provider/package/pkg.rb.orig	2016-04-19 15:09:14.789792650 -0700
-+++ puppet-3.8.6/lib/puppet/provider/package/pkg.rb	2016-04-19 15:09:44.646514474 -0700
-@@ -5,7 +5,7 @@
+diff --git a/lib/puppet/provider/package/pkg.rb b/lib/puppet/provider/package/pkg.rb
+--- a/lib/puppet/provider/package/pkg.rb
++++ b/lib/puppet/provider/package/pkg.rb
+@@ -1,7 +1,7 @@
  require 'puppet/provider/package'
  
  Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package do
--  desc "OpenSolaris image packaging system. See pkg(5) for more information"
+-  desc "OpenSolaris image packaging system. See pkg(5) for more information."
 +  desc "Solaris image packaging system. See pkg(5) for more information"
-   # http://docs.oracle.com/cd/E19963-01/html/820-6572/managepkgs.html
-   # A few notes before we start :
+   # https://docs.oracle.com/cd/E19963-01/html/820-6572/managepkgs.html
+   # A few notes before we start:
    # Opensolaris pkg has two slightly different formats (as of now.)
-@@ -18,10 +18,10 @@
+@@ -14,10 +14,10 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
    # TODO: We still have to allow packages to specify a preferred publisher.
  
    has_feature :versionable
@@ -29,16 +30,7 @@
  
    commands :pkg => "/usr/bin/pkg"
  
-@@ -30,7 +30,7 @@
-   defaultfor :osfamily => :solaris, :kernelrelease => ['5.11', '5.12']
- 
-   def self.instances
--    pkg(:list, '-H').split("\n").map{|l| new(parse_line(l))}
-+    pkg(:list, '-Hv').split("\n").map{|l| new(parse_line(l))}
-   end
- 
-   # The IFO flag field is just what it names, the first field can have ether
-@@ -73,6 +73,10 @@
+@@ -69,6 +69,10 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
      {}
    end
  
@@ -49,28 +41,10 @@
    # pkg state was present in the older version of pkg (with UFOXI) but is
    # no longer available with the IFO field version. When it was present,
    # it was used to indicate that a particular version was present (installed)
-@@ -94,29 +98,73 @@
-   # formats of output for different pkg versions.
-   def self.parse_line(line)
-     (case line.chomp
--    # NAME (PUBLISHER)            VERSION           IFO  (new:630e1ffc7a19)
--    # system/core-os              0.5.11-0.169      i--
--    when /^(\S+) +(\S+) +(...)$/
--      {:name => $1, :ensure => $2}.merge ifo_flag($3)
--
--    # x11/wm/fvwm (fvwm.org)      2.6.1-3           i--
--    when /^(\S+) \((.+)\) +(\S+) +(...)$/
--      {:name => $1, :publisher => $2, :ensure => $3}.merge ifo_flag($4)
--
--    # NAME (PUBLISHER)                  VERSION          STATE      UFOXI (dvd:052adf36c3f4)
--    # SUNWcs                            0.5.11-0.126     installed  -----
--    when /^(\S+) +(\S+) +(\S+) +(.....)$/
--      {:name => $1, :ensure => $2}.merge pkg_state($3).merge(ufoxi_flag($4))
--
--    # web/firefox/plugin/flash (extra)  10.0.32.18-0.111 installed  -----
--    when /^(\S+) \((.+)\) +(\S+) +(\S+) +(.....)$/
--      {:name => $1, :publisher => $2, :ensure => $3}.merge pkg_state($4).merge(ufoxi_flag($5))
--
+@@ -100,11 +104,74 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
+     when %r'^pkg://([^/]+)/([^@]+)@(\S+) +(\S+) +(.....)$'
+       {:publisher => $1, :name => $2, :ensure => $3}.merge pkg_state($4).merge(ufoxi_flag($5))
+ 
 +    #pkg list -vH output format since build 165
 +    #FMRI                                                                         IFO
 +    #pkg://solaris/system/[email protected]:20151116T010109Z           i--
@@ -91,6 +65,7 @@
 +    when /^(\S+) +(\S+) +(....)$/
 +      full_fmri = $1.split('@')
 +      {:name => full_fmri[0], :ensure => full_fmri[1]}.merge pkg_state($2).merge(ufxi_flag($3))
++
      else
        raise ArgumentError, 'Unknown line format %s: %s' % [self.name, line]
      end).merge({:provider => self.name})
@@ -141,26 +116,31 @@
    def hold
      pkg(:freeze, @resource[:name])
    end
-@@ -126,31 +174,22 @@
-     raise Puppet::Error, "Unable to unfreeze #{r[:out]}" unless [0,4].include? r[:exit]
+@@ -167,28 +234,28 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
+     false
    end
  
 -  # Return the version of the package. Note that the bug
 -  # http://defect.opensolaris.org/bz/show_bug.cgi?id=19159%
 -  # notes that we can't use -Ha for the same even though the manual page reads that way.
-+  # Return the version of the package.
    def latest
--    lines = pkg(:list, "-Hn", @resource[:name]).split("\n")
--
--    # remove certificate expiration warnings from the output, but report them
--    # Note: we'd like to use select! here to modify the lines array and avoid
--    #       the second select further down. But Solaris 11 comes with ruby 1.8.7
--    #       which doesn't support select!, so do this as two selects.
+-    lines = pkg(:list, "-Hvn", @resource[:name]).split("\n")
++    # Dry-run package update to check the availability of the latest version
++    # -- return code --
++    # 0: latest version available
++    # 1: error
++    # 4: already up-to-date
++    r = exec_cmd(command(:pkg), 'update', '-n', '--parsable=0', @resource[:name]).split('\n')
++    package_versions = JSON.parse(r[:out])['change-packages']
+ 
+     # remove certificate expiration warnings from the output, but report them
 -    cert_warnings = lines.select { |line| line =~ /^Certificate/ }
--    if cert_warnings
--      Puppet.warning("pkg warning: #{cert_warnings}")
--    end
--
++    cert_warnings = r[:out].select { |line| line =~ /^Certificate/ }
+     unless cert_warnings.empty?
+       Puppet.warning("pkg warning: #{cert_warnings.join(', ')}")
+     end
++    lst = r[:out].select { |line| line !~ /^Certificate/ }.map { |line| self.class.parse_line(line) }
+ 
 -    lst = lines.select { |line| line !~ /^Certificate/ }.map { |line| self.class.parse_line(line) }
 -
 -    # Now we know there is a newer version. But is that installable? (i.e are there any constraints?)
@@ -168,45 +148,30 @@
 -    # pkg update and see if could get installed (`pkg update -n res`).
 -    known = lst.find {|p| p[:status] == 'known' }
 -    return known[:ensure] if known and exec_cmd(command(:pkg), 'update', '-n', @resource[:name])[:exit].zero?
--
++    raise Puppet::Error, "Cannot update to the latest package: #{r[:out]}\n" \
++      unless [0, 4].include? r[:exit]
+ 
 -    # If not, then return the installed, else nil
 -    (lst.find {|p| p[:status] == 'installed' } || {})[:ensure]
-+    # Dry-run package update to check the availability of the latest version
-+    # -- return code --
-+    # 0: latest version available
-+    # 1: error
-+    # 4: already up-to-date
-+    r = exec_cmd(command(:pkg), 'update', '-n', '--parsable=0', @resource[:name])
-+    raise Puppet::Error, "Cannot update to the latest package: #{r[:out]}\n" \
-+      unless [0, 4].include? r[:exit]
-+
-+    package_versions = JSON.parse(r[:out])['change-packages']
-+
 +    lst =  parse_latest_query(r[:exit], package_versions)
 +    Puppet.debug "Desirable query status = #{lst}"
 +    return lst[:ensure]
    end
  
    # install the package and accept all licenses.
-@@ -166,19 +205,22 @@
-         self.uninstall if Puppet::Util::Package.versioncmp(should, is[:ensure]) < 0
-       end
+@@ -206,7 +273,10 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
+     unless should.is_a? Symbol
+       name += "@#{should}"
      end
--    r = exec_cmd(command(:pkg), 'install', '--accept', name)
+-    r = exec_cmd(command(:pkg), command, '--accept', name)
 +
-+    cmd = ['--accept']
-+    cmd << join_options(@resource[:install_options]) if @resource[:install_options]
-+    r = exec_cmd(command(:pkg), 'install', cmd, name)
++    opts = ['--accept']
++    opts << join_options(@resource[:install_options]) if @resource[:install_options]
++    r = exec_cmd(command(:pkg), 'install', opts, name)
      return r if nofail
      raise Puppet::Error, "Unable to update #{r[:out]}" if r[:exit] != 0
    end
- 
--  # uninstall the package. The complication comes from the -r_ecursive flag which is no longer
--  # present in newer package version.
-+  # uninstall the package.
-   def uninstall
-     cmd = [:uninstall]
-     case (pkg :version).chomp
+@@ -219,6 +289,7 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
      when /052adf36c3f4/
        cmd << '-r'
      end
@@ -214,7 +179,7 @@
      cmd << @resource[:name]
      pkg cmd
    end
-@@ -191,10 +233,22 @@
+@@ -231,10 +302,22 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
      raise Puppet::Error, "Unable to update #{r[:out]}"
    end
  
@@ -224,8 +189,7 @@
 +
    # list a specific package
    def query
--    r = exec_cmd(command(:pkg), 'list', '-H', @resource[:name])
-+    r = exec_cmd(command(:pkg), 'list', '-Hv', @resource[:name])
+     r = exec_cmd(command(:pkg), 'list', '-Hv', @resource[:name])
      return {:ensure => :absent, :name => @resource[:name]} if r[:exit] != 0
 +
 +    # Does input contain wildcard? just pass it down and let pkg decide
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet/patches/puppet-13-default-smf.patch	Mon Nov 28 16:54:02 2016 -0800
@@ -0,0 +1,19 @@
+24680838 puppet agent failures should be visible to administrator via SMF interfaces
+
+Patch could be submitted but is unlikely to be accepted by upstream.
+The default behavior is as expected by Puppet.
+--- puppet-4.7.0/lib/puppet/defaults.rb.orig	2016-12-02 09:53:01.707789111 +0000
++++ puppet-4.7.0/lib/puppet/defaults.rb	2016-12-02 10:01:54.281041266 +0000
+@@ -123,6 +123,12 @@
+         end
+       end
+     },
++    :degrade_smf_on_error => {
++        :default  => true,
++        :type     => :boolean,
++        :desc     => "Whether the SMF service for puppet should be degraded when an error
++          is logged.",
++    },
+     :strict => {
+       :default    => :warning,
+       :type       => :symbolic_enum,
--- a/components/ruby/puppet/patches/puppet-13-smf-restartcmd.patch	Wed Jan 11 15:24:27 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-Add -s for synchronous restart
-Upstream as PUP-6233
-
-diff --git a/lib/puppet/provider/service/smf.rb b/lib/puppet/provider/service/smf.rb
---- a/lib/puppet/provider/service/smf.rb
-+++ b/lib/puppet/provider/service/smf.rb
-@@ -66,7 +71,12 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
-   end
-
-   def restartcmd
--    [command(:adm), :restart, @resource[:name]]
-+    if Puppet::Util::Package.versioncmp(Facter.value(:kernelrelease), '5.11') >= 0
-+      [command(:adm), :restart, "-s", @resource[:name]]
-+    else
-+      # Solaris 10 does not have synchronous restart
-+      [command(:adm), :restart, @resource[:name]]
-+    end
-   end
-
-   def startcmd
-diff --git a/spec/unit/provider/service/smf_spec.rb b/spec/unit/provider/service/smf_spec.rb
---- a/spec/unit/provider/service/smf_spec.rb
-+++ b/spec/unit/provider/service/smf_spec.rb
-@@ -1,4 +1,7 @@
- #! /usr/bin/env ruby
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
- #
- # Unit testing for the SMF service Provider
- #
-@@ -20,6 +23,8 @@ describe provider_class, :as_platform => :posix do
-     FileTest.stubs(:executable?).with('/usr/sbin/svcadm').returns true
-     FileTest.stubs(:file?).with('/usr/bin/svcs').returns true
-     FileTest.stubs(:executable?).with('/usr/bin/svcs').returns true
-+    Facter.clear
-+    Facter.stubs(:fact).with(:kernelrelease).returns Facter.add(:kernelrelease) { setcode { '5.11' } }
-   end
-
-   describe ".instances" do
-@@ -144,8 +149,30 @@ describe provider_class, :as_platform => :posix do
-   end
-
-   describe "when restarting" do
-+    context 'with :kernelrelease == 5.10' do
-+      it "should call 'svcadm restart /system/myservice'" do
-+        Facter.clear
-+        Facter.stubs(:fact).with(:kernelrelease).returns Facter.add(:kernelrelease) { setcode { '5.10' } }
-+        @provider.expects(:texecute).with(:restart, ["/usr/sbin/svcadm", :restart, "/system/myservice"], true)
-+        @provider.restart
-+      end
-+    end
-+    context 'with :kernelrelease == 5.11' do
-+      it "should call 'svcadm restart -s /system/myservice'" do
-+        @provider.expects(:texecute).with(:restart, ["/usr/sbin/svcadm", :restart, "-s", "/system/myservice"], true)
-+        @provider.restart
-+      end
-+    end
-+    context 'with :kernelrelease >= 5.11' do
-+      it "should call 'svcadm restart -s /system/myservice'" do
-+        Facter.clear
-+        Facter.stubs(:fact).with(:kernelrelease).returns Facter.add(:kernelrelease) { setcode { '5.12' } }
-+        @provider.expects(:texecute).with(:restart, ["/usr/sbin/svcadm", :restart, "-s", "/system/myservice"], true)
-+        @provider.restart
-+      end
-+    end
-     it "should call 'svcadm restart /system/myservice'" do
--      @provider.expects(:texecute).with(:restart, ["/usr/sbin/svcadm", :restart, "/system/myservice"], true)
-+      @provider.expects(:texecute).with(:restart, ["/usr/sbin/svcadm", :restart, "-s", "/system/myservice"], true)
-       @provider.restart
-     end
-   end
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet/patches/puppet-14-log-smf.patch	Mon Nov 28 16:54:02 2016 -0800
@@ -0,0 +1,50 @@
+24680838 puppet agent failures should be visible to administrator via SMF interfaces
+
+Patch could be submitted but is unlikely to be accepted by upstream.
+The default behavior is as expected by Puppet.
+
+--- puppet-4.7.0/lib/puppet/util/log.rb.orig	2016-12-07 11:50:30.148628055 +0000
++++ puppet-4.7.0/lib/puppet/util/log.rb	2016-12-07 11:53:27.475565260 +0000
+@@ -16,6 +16,7 @@
+ 
+   @levels = [:debug,:info,:notice,:warning,:err,:alert,:emerg,:crit]
+   @loglevel = 2
++  @degraded = false
+ 
+   @desttypes = {}
+ 
+@@ -52,6 +53,16 @@
+   # Reset log to basics.  Basically just flushes and closes files and
+   # undefs other objects.
+   def Log.close(destination)
++    if Puppet[:degrade_smf_on_error]
++      if !@degraded
++        if Puppet.run_mode.agent?
++          system 'svcadm clear puppet:agent'
++        elsif Puppet.run_mode.master?
++          system 'svcadm clear puppet:master'
++        end
++      end
++    end
++
+     if @destinations.include?(destination)
+       @destinations[destination].flush if @destinations[destination].respond_to?(:flush)
+       @destinations[destination].close if @destinations[destination].respond_to?(:close)
+@@ -168,6 +179,17 @@
+   # a potential for a loop here, if the machine somehow gets the destination set as
+   # itself.
+   def Log.newmessage(msg)
++    if Puppet[:degrade_smf_on_error]
++      if [:err,:alert,:emerg,:crit].include? msg.level and !@degraded
++        @degraded = true
++        if Puppet.run_mode.agent?
++          system 'svcadm mark -s degraded puppet:agent'
++        elsif Puppet.run_mode.master?
++          system 'svcadm mark -s degraded puppet:master'
++        end
++      end
++    end
++
+     return if @levels.index(msg.level) < @loglevel
+ 
+     queuemessage(msg) if @destinations.length == 0
--- a/components/ruby/puppet/patches/puppet-14-smf-refreshable.patch	Wed Jan 11 15:24:27 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-smf understands the concept of refreshable
-PUP-6238 Serivce SMF should declare has_feature :refreshable
-
-diff --git a/lib/puppet/provider/service/smf.rb b/lib/puppet/provider/service/smf.rb
---- a/lib/puppet/provider/service/smf.rb
-+++ b/lib/puppet/provider/service/smf.rb
-@@ -23,6 +23,8 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
-   commands :adm => "/usr/sbin/svcadm", :svcs => "/usr/bin/svcs"
-   commands :svccfg => "/usr/sbin/svccfg"
-
-+  has_feature :refreshable
-+
-   def setupservice
-       if resource[:manifest]
-         [command(:svcs), "-l", @resource[:name]]
--- a/components/ruby/puppet/patches/puppet-15-shadow-bug.patch	Wed Jan 11 15:24:27 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-Fixes a bug introduced by PUP-229.
-Modification notice injected by puppet-09-role-shell.patch.
-This fix has already been integrated into the Puppet master branch.
-
---- puppet-3.8.6/lib/puppet/provider/user/user_role_add.rb.orig	2016-10-07 10:04:30.993459833 +0000
-+++ puppet-3.8.6/lib/puppet/provider/user/user_role_add.rb	2016-10-07 10:05:07.479333101 +0000
-@@ -191,6 +191,7 @@
-   end
- 
-   def password_min_age
-+    return :absent unless shadow_entry
-     shadow_entry[3].empty? ? -1 : shadow_entry[3]
-   end
- 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet/patches/z-puppet-00.patch	Mon Nov 28 16:54:02 2016 -0800
@@ -0,0 +1,7 @@
+--- a/lib/puppet/provider/package/pkg.rb
+--- b/lib/puppet/provider/package/pkg.rb
+@@ -0,0 +1,4 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet/patches/z-puppet-01.patch	Mon Nov 28 16:54:02 2016 -0800
@@ -0,0 +1,7 @@
+Patch the legal notice in separately...it isn't upstreamed
+--- a/install.rb
++++ b/install.rb
+@@ -2,0 +2,3 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet/patches/z-puppet-04.patch	Mon Nov 28 16:54:02 2016 -0800
@@ -0,0 +1,7 @@
+--- a/lib/puppet/agent.rb
++++ b/lib/puppet/agent.rb
+@@ -0,0 +1,4 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet/patches/z-puppet-05.patch	Mon Nov 28 16:54:02 2016 -0800
@@ -0,0 +1,7 @@
+--- a/lib/puppet/application/apply.rb
++++ b/lib/puppet/application/apply.rb
+@@ -0,0 +1,4 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet/patches/z-puppet-06.patch	Mon Nov 28 16:54:02 2016 -0800
@@ -0,0 +1,7 @@
+--- a/lib/puppet/provider/service/smf.rb
++++ b/lib/puppet/provider/service/smf.rb
+@@ -0,0 +1,4 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet/patches/z-puppet-07.patch	Mon Nov 28 16:54:02 2016 -0800
@@ -0,0 +1,7 @@
+--- a/lib/puppet/application/describe.rb
++++ b/lib/puppet/application/describe.rb
+@@ -0,0 +1,4 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet/patches/z-puppet-09.patch	Mon Nov 28 16:54:02 2016 -0800
@@ -0,0 +1,7 @@
+--- a/lib/puppet/provider/user/user_role_add.rb
++++ b/lib/puppet/provider/user/user_role_add.rb
+@@ -0,0 +1,4 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet/patches/z-puppet-13.patch	Mon Nov 28 16:54:02 2016 -0800
@@ -0,0 +1,7 @@
+--- a/lib/puppet/defaults.rb
++++ b/lib/puppet/defaults.rb
+@@ -0,0 +1,4 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet/patches/z-puppet-14.patch	Mon Nov 28 16:54:02 2016 -0800
@@ -0,0 +1,7 @@
+--- a/lib/puppet/util/log.rb
++++ b/lib/puppet/util/log.rb
+@@ -0,0 +0,4 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
--- a/components/ruby/puppet/puppet.p5m	Wed Jan 11 15:24:27 2017 -0800
+++ b/components/ruby/puppet/puppet.p5m	Mon Nov 28 16:54:02 2016 -0800
@@ -41,13 +41,36 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2013/005 value=PSARC/2013/218 \
     value=PSARC/2013/221 value=PSARC/2013/288 value=PSARC/2013/426 \
-    value=PSARC/2016/016
+    value=PSARC/2016/016 value=PSARC/2016/607
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.smf.fmri value=svc:/application/puppet:agent \
     value=svc:/application/puppet:master
-dir  path=etc/puppet owner=puppet group=puppet mode=0755
-file path=etc/puppet/auth.conf owner=puppet group=bin mode=0444
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/hiera/backend/puppet_backend.rb
+file files/puppet.logadm.conf path=etc/logadm.d/puppet.logadm.conf group=sys \
+    restart_fmri=svc:/system/logadm-upgrade:default
+# salvaging all of puppet carries over more than we need but the
+# extra bits are ignored by puppet should have been cleaned up as part
+# of pre-migration
+dir  path=etc/puppetlabs/puppet owner=puppet group=puppet mode=0755 \
+    revert-tag=system:clone=* salvage-from=etc/puppet
+file path=etc/puppetlabs/puppet/auth.conf owner=puppet group=bin mode=0444 \
+    original_name=system/management/puppet:etc/puppet/auth.conf overlay=allow \
+    preserve=true
+dir  path=etc/puppetlabs/puppet/code/environments owner=puppet group=puppet \
+    mode=0755
+file files/auth_attr path=etc/security/auth_attr.d/system:management:puppet
+file files/exec_attr path=etc/security/exec_attr.d/system:management:puppet
+file files/prof_attr path=etc/security/prof_attr.d/system:management:puppet
+file files/user_attr path=etc/user_attr.d/system:management:puppet
+file files/puppet.xml path=lib/svc/manifest/application/puppet.xml \
+    restart_fmri=svc:/system/manifest-import:default
+file files/puppet.stencil path=lib/svc/stencils/puppet.stencil
+file files/upgrade.sh path=usr/puppetlabs/puppet/bin/upgrade.sh
+dir  path=usr/puppetlabs/puppet/code owner=puppet group=bin mode=755 \
+    revert-tag=system:clone=*
+dir  path=usr/puppetlabs/puppet/modules owner=puppet group=bin mode=755 \
+    salvage-from=/etc/puppet/modules
+file ext/PuppetAudit.so \
+    path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/$(MACH64)-solaris$(SOLARIS_VERSION)/PuppetAudit.so
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/hiera/puppet_function.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/hiera/scope.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/hiera_puppet.rb
@@ -68,32 +91,31 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/describe.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/device.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/doc.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/epp.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/face_base.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/facts.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/file.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/filebucket.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/generate.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/help.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/indirection_base.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/inspect.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/instrumentation_data.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/instrumentation_listener.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/instrumentation_probe.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/key.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/kick.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/lookup.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/man.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/master.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/module.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/node.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/parser.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/plugin.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/queue.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/report.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/resource.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/resource_type.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/secret_agent.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application/status.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/application_support.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/bindings.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/coercion.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/compilable_resource_type.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/configurer.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/configurer/downloader.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/configurer/downloader_factory.rb
@@ -112,10 +134,20 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/context/trusted_information.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/daemon.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/data_binding.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/data_providers.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/data_providers/data_adapter.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/data_providers/data_function_support.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/data_providers/function_env_data_provider.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/data_providers/function_module_data_provider.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/data_providers/hiera_config.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/data_providers/hiera_env_data_provider.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/data_providers/hiera_interpolate.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/data_providers/hiera_module_data_provider.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/data_providers/hiera_support.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/data_providers/json_data_provider_factory.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/data_providers/lookup_adapter.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/data_providers/yaml_data_provider_factory.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/defaults.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/dsl.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/dsl/resource_api.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/dsl/resource_type_api.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/environments.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/error.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/external/dot.rb
@@ -137,18 +169,17 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/face/certificate_request.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/face/certificate_revocation_list.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/face/config.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/face/epp.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/face/facts.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/face/file.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/face/file/download.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/face/file/store.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/face/generate.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/face/help.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/face/help/action.erb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/face/help/face.erb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/face/help/global.erb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/face/help/man.erb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/face/instrumentation_data.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/face/instrumentation_listener.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/face/instrumentation_probe.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/face/key.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/face/man.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/face/module.rb
@@ -167,35 +198,30 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/face/report.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/face/resource.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/face/resource_type.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/face/secret_agent.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/face/status.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/feature/base.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/feature/cfacter.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/feature/cfpropertylist.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/feature/eventlog.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/feature/external_facts.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/feature/libuser.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/feature/msgpack.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/feature/pe_license.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/feature/pson.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/feature/rack.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/feature/rails.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/feature/rdoc1.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/feature/rubygems.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/feature/selinux.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/feature/ssh.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/feature/stomp.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/feature/telnet.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/feature/zlib.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/file_bucket.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/file_bucket/dipper.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/file_bucket/file.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/file_collection.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/file_collection/lookup.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/file_serving.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/file_serving/base.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/file_serving/configuration.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/file_serving/configuration/parser.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/file_serving/content.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/file_serving/fileset.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/file_serving/http_metadata.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/file_serving/metadata.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/file_serving/mount.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/file_serving/mount/file.rb
@@ -205,14 +231,13 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/file_serving/terminus_helper.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/file_serving/terminus_selector.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/file_system.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/file_system/file18.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/file_system/file19.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/file_system/file19windows.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/file_system/file_impl.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/file_system/memory_file.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/file_system/memory_impl.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/file_system/path_pattern.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/file_system/posix.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/file_system/uniquefile.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/file_system/windows.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/forge.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/forge/cache.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/forge/errors.rb
@@ -220,6 +245,7 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/functions.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/functions/assert_type.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/functions/defined.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/functions/dig.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/functions/each.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/functions/epp.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/functions/filter.rb
@@ -229,12 +255,27 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/functions/hiera_include.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/functions/import.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/functions/inline_epp.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/functions/lest.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/functions/lookup.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/functions/map.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/functions/match.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/functions/new.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/functions/reduce.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/functions/regsubst.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/functions/reverse_each.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/functions/scanf.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/functions/slice.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/functions/split.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/functions/step.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/functions/then.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/functions/type.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/functions/unwrap.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/functions/versioncmp.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/functions/with.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/generate/models/type/property.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/generate/models/type/type.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/generate/templates/type/pcore.erb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/generate/type.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/graph.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/graph/key.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/graph/prioritizer.rb
@@ -245,12 +286,9 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/graph/simple_graph.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/graph/title_hash_prioritizer.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/active_record.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/catalog/active_record.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/catalog/compiler.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/catalog/json.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/catalog/msgpack.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/catalog/queue.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/catalog/rest.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/catalog/static_compiler.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/catalog/store_configs.rb
@@ -272,7 +310,6 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/certificate_status/file.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/certificate_status/rest.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/code.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/couch.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/data_binding/hiera.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/data_binding/none.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/direct_file_server.rb
@@ -280,14 +317,9 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/errors.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/exec.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/face.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/facts/active_record.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/facts/couch.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/facts/facter.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/facts/inventory_active_record.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/facts/inventory_service.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/facts/memory.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/facts/network_device.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/facts/rest.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/facts/store_configs.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/facts/yaml.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/file_bucket_file/file.rb
@@ -296,25 +328,19 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/file_content.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/file_content/file.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/file_content/file_server.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/file_content/http.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/file_content/rest.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/file_content/selector.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/file_metadata.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/file_metadata/file.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/file_metadata/file_server.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/file_metadata/http.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/file_metadata/rest.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/file_metadata/selector.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/file_server.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/generic_http.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/hiera.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/indirection.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/instrumentation_data.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/instrumentation_data/local.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/instrumentation_data/rest.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/instrumentation_listener.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/instrumentation_listener/local.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/instrumentation_listener/rest.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/instrumentation_probe.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/instrumentation_probe/local.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/instrumentation_probe/rest.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/json.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/key/ca.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/key/disabled_ca.rb
@@ -323,7 +349,6 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/ldap.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/memory.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/msgpack.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/node/active_record.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/node/exec.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/node/ldap.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/node/memory.rb
@@ -335,23 +360,18 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/node/yaml.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/none.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/plain.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/queue.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/report/msgpack.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/report/processor.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/report/rest.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/report/yaml.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/request.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/resource/active_record.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/resource/ral.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/resource/rest.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/resource/store_configs.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/resource/validator.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/resource_type.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/resource_type/parser.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/resource_type/rest.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/rest.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/run/local.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/run/rest.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/ssl_file.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/status.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/status/local.rb
@@ -359,6 +379,8 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/store_configs.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/terminus.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/indirector/yaml.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/info_service.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/info_service/class_information_service.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/interface.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/interface/action.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/interface/action_builder.rb
@@ -394,27 +416,21 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/installed_modules.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/local_tarball.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/metadata.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/modulefile.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/shared_behaviors.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/skeleton/templates/generator/Gemfile
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/skeleton/templates/generator/README.md.erb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/skeleton/templates/generator/Rakefile
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/skeleton/templates/generator/examples/init.pp.erb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/skeleton/templates/generator/manifests/init.pp.erb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/skeleton/templates/generator/metadata.json.erb
-file \
-    path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/skeleton/templates/generator/spec/classes/init_spec.rb.erb \
-    facet.optional.test=true
-file \
-    path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/skeleton/templates/generator/spec/spec_helper.rb \
-    facet.optional.test=true
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/skeleton/templates/generator/tests/init.pp.erb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/skeleton/templates/generator/spec/classes/init_spec.rb.erb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/skeleton/templates/generator/spec/spec_helper.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/tar.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/tar/gnu.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/module_tool/tar/mini.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/network.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/network/auth_config_parser.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/network/authconfig.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/network/authentication.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/network/authorization.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/network/authstore.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/network/client_request.rb
@@ -424,10 +440,15 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/network/formats.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/network/http.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/network/http/api.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/network/http/api/v1.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/network/http/api/v2.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/network/http/api/v2/authorization.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/network/http/api/v2/environments.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/network/http/api/ca.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/network/http/api/ca/v1.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/network/http/api/indirected_routes.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/network/http/api/indirection_type.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/network/http/api/master.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/network/http/api/master/v3.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/network/http/api/master/v3/authorization.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/network/http/api/master/v3/environment.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/network/http/api/master/v3/environments.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/network/http/compression.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/network/http/connection.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/network/http/error.rb
@@ -462,56 +483,33 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parameter/value_collection.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/arithmetic_operator.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/astarray.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/asthash.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/block_expression.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/boolean_operator.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/branch.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/caseopt.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/casestatement.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/collection.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/collexpr.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/comparison_operator.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/definition.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/else.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/function.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/hostclass.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/ifstatement.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/in_operator.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/lambda.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/leaf.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/match_operator.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/method_call.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/minus.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/node.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/nop.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/not.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/pops_bridge.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/relationship.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/resource.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/resource_defaults.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/resource_instance.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/resource_override.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/resource_reference.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/resourceparam.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/selector.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/top_level_construct.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/ast/vardef.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/code_merger.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/collector.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/compiler.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/compiler/catalog_validator.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/compiler/catalog_validator/relationship_validator.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/compiler/catalog_validator/site_validator.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/e4_parser_adapter.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/environment_compiler.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/files.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/assert_type.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/contain.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/create_resources.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/defined.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/dig.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/digest.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/each.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/epp.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/extlookup.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/fail.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/file.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/filter.rb
@@ -524,33 +522,32 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/include.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/inline_epp.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/inline_template.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/lest.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/lookup.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/map.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/match.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/md5.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/new.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/realize.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/reduce.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/regsubst.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/require.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/reverse_each.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/scanf.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/search.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/sha1.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/shellquote.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/slice.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/split.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/sprintf.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/step.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/tag.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/tagged.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/template.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/then.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/type.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/versioncmp.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/functions/with.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/grammar.ra
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/lexer.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/makefile
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/methods.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/parser.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/parser_factory.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/parser_support.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/relationship.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/resource.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/resource/param.rb
@@ -558,6 +555,13 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/templatewrapper.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/type_loader.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/parser/yaml_trimmer.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/plugins.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/plugins/binding_schemes.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/plugins/configuration.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/plugins/data_providers.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/plugins/data_providers/data_provider.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/plugins/data_providers/registry.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/plugins/syntax_checkers.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/adaptable.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/adapters.rb
@@ -579,7 +583,6 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/binder/injector.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/binder/injector_entry.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/binder/key_factory.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/binder/lookup.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/binder/producers.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/binder/scheme_handler/confdir_scheme.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/binder/scheme_handler/module_scheme.rb
@@ -587,7 +590,6 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/binder/system_bindings.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/containment.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/evaluator/access_operator.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/evaluator/callable_mismatch_describer.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/evaluator/callable_signature.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/evaluator/closure.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/evaluator/collector_transformer.rb
@@ -599,9 +601,12 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/evaluator/epp_evaluator.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/evaluator/evaluator_impl.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/evaluator/external_syntax_support.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/evaluator/json_strict_literal_evaluator.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/evaluator/literal_evaluator.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/evaluator/puppet_proc.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/evaluator/relationship_operator.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/evaluator/runtime3_converter.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/evaluator/runtime3_resource_support.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/evaluator/runtime3_support.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/functions/dispatch.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/functions/dispatcher.rb
@@ -616,14 +621,25 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/loader/loader_paths.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/loader/module_loaders.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/loader/null_loader.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/loader/predefined_loader.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/loader/puppet_function_instantiator.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/loader/puppet_resource_type_impl_instantiator.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/loader/ruby_function_instantiator.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/loader/runtime3_type_loader.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/loader/simple_environment_loader.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/loader/static_loader.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/loader/type_definition_instantiator.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/loader/typed_name.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/loader/uri_helper.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/loaders.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/lookup.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/lookup/explainer.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/lookup/interpolation.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/lookup/invocation.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/lookup/sub_lookup.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/merge_strategy.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/migration/migration_checker.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/model/ast_transformer.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/model/ast_tree_dumper.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/model/factory.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/model/model.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/model/model_label_provider.rb
@@ -645,14 +661,51 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/parser/parser_support.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/parser/slurp_support.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/patterns.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/pcore.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/puppet_stack.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/resource/param.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/resource/resource_type_impl.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/resource/resource_type_set.pcore
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/semantic_error.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/serialization.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/serialization/abstract_reader.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/serialization/abstract_writer.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/serialization/deserializer.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/serialization/extension.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/serialization/instance_reader.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/serialization/instance_writer.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/serialization/json.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/serialization/object.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/serialization/rgen.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/serialization/serializer.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/serialization/time_factory.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/types/annotatable.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/types/class_loader.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/types/enumeration.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/types/implementation_registry.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/types/iterable.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/types/p_meta_type.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/types/p_object_type.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/types/p_runtime_type.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/types/p_sem_ver_range_type.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/types/p_sem_ver_type.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/types/p_sensitive_type.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/types/p_type_set_type.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/types/puppet_object.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/types/recursion_guard.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/types/ruby_generator.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/types/string_converter.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/types/type_acceptor.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/types/type_asserter.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/types/type_assertion_error.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/types/type_calculator.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/types/type_conversion_error.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/types/type_factory.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/types/type_formatter.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/types/type_mismatch_describer.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/types/type_parser.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/types/type_set_reference.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/types/types.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/types/types_meta.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/utils.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/validation.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/pops/validation/checker4_0.rb
@@ -708,29 +761,33 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/aptitude.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/aptrpm.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/blastwave.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/dnf.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/dpkg.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/fink.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/freebsd.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/gem.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/hpux.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/macports.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/msi.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/nim.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/openbsd.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/opkg.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/pacman.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/pip.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/pip3.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/pkg.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/pkgdmg.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/pkgin.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/pkgng.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/pkgutil.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/portage.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/ports.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/portupgrade.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/puppet_gem.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/rpm.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/rug.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/sun.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/sunfreeware.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/tdnf.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/up2date.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/urpmi.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/windows.rb
@@ -738,7 +795,6 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/windows/msi_package.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/windows/package.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/yum.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/yumhelper.py
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/zypper.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/parsedfile.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/scheduled_task/win32_taskscheduler.rb
@@ -755,6 +811,7 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/service/openbsd.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/service/openrc.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/service/openwrt.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/service/rcng.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/service/redhat.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/service/runit.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/service/service.rb
@@ -769,6 +826,7 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/user/directoryservice.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/user/hpux.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/user/ldap.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/user/openbsd.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/user/pw.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/user/user_role_add.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/user/useradd.rb
@@ -778,24 +836,6 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/zfs/zfs.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/zone/solaris.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/zpool/zpool.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/rails.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/rails/benchmark.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/rails/database/001_add_created_at_to_all_tables.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/rails/database/002_remove_duplicated_index_on_all_tables.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/rails/database/003_add_environment_to_host.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/rails/database/004_add_inventory_service_tables.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/rails/database/schema.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/rails/fact_name.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/rails/fact_value.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/rails/host.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/rails/inventory_fact.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/rails/inventory_node.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/rails/param_name.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/rails/param_value.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/rails/puppet_tag.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/rails/resource.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/rails/resource_tag.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/rails/source_file.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/reference/configuration.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/reference/function.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/reference/indirection.rb
@@ -807,16 +847,13 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/reports.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/reports/http.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/reports/log.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/reports/rrdgraph.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/reports/store.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/reports/tagmail.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/resource.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/resource/capability_finder.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/resource/catalog.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/resource/status.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/resource/type.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/resource/type_collection.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/resource/type_collection_helper.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/run.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/scheduler.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/scheduler/job.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/scheduler/scheduler.rb
@@ -838,7 +875,9 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/settings/ini_file.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/settings/path_setting.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/settings/priority_setting.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/settings/server_list_setting.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/settings/string_setting.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/settings/symbolic_enum_setting.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/settings/terminus_setting.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/settings/ttl_setting.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/settings/value_translator.rb
@@ -863,11 +902,14 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/ssl/validator/default_validator.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/ssl/validator/no_validator.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/status.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/syntax_checkers.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/syntax_checkers/json.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/test/test_helper.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/transaction.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/transaction/additional_resource_generator.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/transaction/event.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/transaction/event_manager.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/transaction/persistence.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/transaction/report.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/transaction/resource_harness.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/type.rb
@@ -878,8 +920,10 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/type/exec.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/type/file.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/type/file/checksum.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/type/file/checksum_value.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/type/file/content.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/type/file/ctime.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/type/file/data_sync.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/type/file/ensure.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/type/file/group.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/type/file/mode.rb
@@ -936,7 +980,6 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/autoload.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/backups.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/cacher.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/checksums.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/classgen.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/colors.rb
@@ -955,15 +998,7 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/filetype.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/http_proxy.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/inifile.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/inline_docs.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/instance_loader.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/instrumentation.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/instrumentation/data.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/instrumentation/indirection_probe.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/instrumentation/instrumentable.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/instrumentation/listener.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/instrumentation/listeners/log.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/instrumentation/listeners/performance.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/json_lockfile.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/ldap.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/ldap/connection.rb
@@ -976,13 +1011,12 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/log.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/log/destination.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/log/destinations.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/log/rate_limited_logger.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/logging.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/metaid.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/methodhelper.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/metric.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/monkey_patches.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/monkey_patches/lines.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/multi_match.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/nagios_maker.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/network_device.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/network_device/base.rb
@@ -999,7 +1033,7 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/package.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/pidlock.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/platform.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/plugins.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/plist.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/posix.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/profiler.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/profiler/aggregate.rb
@@ -1008,26 +1042,22 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/profiler/object_counts.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/profiler/wall_clock.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/provider_features.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/pson.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/queue.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/queue/stomp.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/rails/cache_accumulator.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/rails/collection_merger.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/rails/reference_serializer.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/psych_support.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/rdoc.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/rdoc/code_objects.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/rdoc/generators/puppet_generator.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/rdoc/generators/template/puppet/puppet.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/rdoc/parser.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/rdoc/parser/puppet_parser_core.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/rdoc/parser/puppet_parser_rdoc1.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/rdoc/parser/puppet_parser_rdoc2.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/reference.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/resource_template.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/retryaction.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/retry_action.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/rubygems.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/run_mode.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/selinux.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/skip_tags.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/splayer.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/ssl.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/storage.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/suidmanager.rb
@@ -1050,6 +1080,7 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/windows/com.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/windows/error.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/windows/file.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/windows/principal.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/windows/process.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/windows/registry.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/windows/root_certs.rb
@@ -1060,11 +1091,22 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/windows/taskscheduler.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/windows/user.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/yaml.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/util/zaml.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/deep_merge/CHANGELOG
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/deep_merge/Gemfile
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/deep_merge/LICENSE
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/deep_merge/PUPPET_README.md
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/deep_merge/README.md
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/deep_merge/Rakefile
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/deep_merge/deep_merge.gemspec
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/deep_merge/lib/deep_merge.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/deep_merge/lib/deep_merge/core.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/deep_merge/lib/deep_merge/deep_merge_hash.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/deep_merge/lib/deep_merge/rails_compat.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/deep_merge/test/test_deep_merge.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/load_deep_merge.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/load_pathspec.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/load_rgen.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/load_safe_yaml.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/load_semantic.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/pathspec/CHANGELOG.md
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/pathspec/LICENSE
@@ -1232,49 +1274,7 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/rgen/test/xml_instantiator_test/simple_xmi_ecore_instantiator.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/rgen/test/xml_instantiator_test/simple_xmi_metamodel.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/rgen/test/xml_instantiator_test/simple_xmi_to_ecore.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/CHANGES.md
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/Gemfile
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/LICENSE.txt
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/PUPPET_README.md
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/README.md
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/Rakefile
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/lib/safe_yaml.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/lib/safe_yaml/deep.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/lib/safe_yaml/parse/date.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/lib/safe_yaml/parse/hexadecimal.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/lib/safe_yaml/parse/sexagesimal.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/lib/safe_yaml/psych_handler.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/lib/safe_yaml/psych_resolver.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/lib/safe_yaml/resolver.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/lib/safe_yaml/safe_to_ruby_visitor.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/lib/safe_yaml/syck_hack.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/lib/safe_yaml/syck_node_monkeypatch.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/lib/safe_yaml/syck_resolver.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/lib/safe_yaml/transform.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_boolean.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_date.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_float.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_integer.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_nil.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_symbol.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/lib/safe_yaml/transform/transformation_map.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/lib/safe_yaml/version.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/run_specs_all_ruby_versions.sh
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/safe_yaml.gemspec
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/spec/exploit.1.9.2.yaml
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/spec/exploit.1.9.3.yaml
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/spec/psych_resolver_spec.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/spec/resolver_specs.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/spec/safe_yaml_spec.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/spec/spec_helper.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/spec/support/exploitable_back_door.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/spec/syck_resolver_spec.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/spec/transform/base64_spec.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/spec/transform/to_date_spec.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/spec/transform/to_float_spec.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/spec/transform/to_integer_spec.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml/spec/transform/to_symbol_spec.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/safe_yaml_patches.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/rgen_patch.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/semantic/Gemfile
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/semantic/PUPPET_README.md
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/semantic/Rakefile
@@ -1297,10 +1297,7 @@
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/semantic/spec/unit/semantic/version_range_spec.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/vendor/semantic/spec/unit/semantic/version_spec.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/version.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppetx.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppetx/puppet/bindings_scheme_handler.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppetx/puppet/syntax_checker.rb
-file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppetx/puppetlabs/syntax_checkers/json.rb
+file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet_x.rb
 file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/semver.rb
 file path=usr/sbin/extlookup2hiera
 file path=usr/sbin/puppet
@@ -1318,33 +1315,32 @@
 file path=usr/share/man/man8/puppet-describe.8
 file path=usr/share/man/man8/puppet-device.8
 file path=usr/share/man/man8/puppet-doc.8
+file path=usr/share/man/man8/puppet-epp.8
 file path=usr/share/man/man8/puppet-facts.8
 file path=usr/share/man/man8/puppet-file.8
 file path=usr/share/man/man8/puppet-filebucket.8
 file path=usr/share/man/man8/puppet-help.8
 file path=usr/share/man/man8/puppet-inspect.8
-file path=usr/share/man/man8/puppet-instrumentation_data.8
-file path=usr/share/man/man8/puppet-instrumentation_listener.8
-file path=usr/share/man/man8/puppet-instrumentation_probe.8
 file path=usr/share/man/man8/puppet-key.8
-file path=usr/share/man/man8/puppet-kick.8
 file path=usr/share/man/man8/puppet-man.8
 file path=usr/share/man/man8/puppet-master.8
 file path=usr/share/man/man8/puppet-module.8
 file path=usr/share/man/man8/puppet-node.8
 file path=usr/share/man/man8/puppet-parser.8
 file path=usr/share/man/man8/puppet-plugin.8
-file path=usr/share/man/man8/puppet-queue.8
 file path=usr/share/man/man8/puppet-report.8
 file path=usr/share/man/man8/puppet-resource.8
 file path=usr/share/man/man8/puppet-resource_type.8
-file path=usr/share/man/man8/puppet-secret_agent.8
 file path=usr/share/man/man8/puppet-status.8
 file path=usr/share/man/man8/puppet.8
-dir  path=var/lib/puppet owner=puppet group=puppet mode=0755 \
+dir  path=var/cache/puppetlabs owner=puppet group=puppet mode=0755 \
+    revert-tag=system:clone=*
+dir  path=var/log/puppetlabs owner=puppet group=puppet mode=0755 \
     revert-tag=system:clone=*
-dir  path=var/log/puppet owner=puppet group=puppet mode=0755 \
-    revert-tag=system:clone=*
+dir  path=var/log/puppetlabs/puppet
+group groupname=puppet gid=40
+user username=puppet ftpuser=false gcos-field="Puppet Admin" group=puppet \
+    home-dir=/etc/puppet login-shell=/bin/false uid=40
 license puppet.license license="Apache v2.0"
 
 # globally applicable low level puppet modules we provide
@@ -1355,14 +1351,15 @@
 depend type=group fmri=system/management/puppet/puppetlabs-rsync
 depend type=group fmri=system/management/puppet/puppetlabs-stdlib
 
-# Depend on renamed versions to pull them forward
+# Depend on renamed/removed versions to pull them forward
 depend type=optional fmri=library/ruby/[email protected]
 depend type=optional fmri=system/management/[email protected]
 # depend on renamed -19 versions to force an update to remove them
 depend type=optional fmri=system/management/[email protected]
+depend type=optional \
+    fmri=system/management/puppet/[email protected]
 
 # Puppet Dependencies
 depend type=require fmri=library/ruby/hiera
 depend type=require fmri=system/management/facter
 depend type=require fmri=system/management/puppet/oracle-solaris_providers
-depend type=require fmri=system/management/puppet/puppet-solaris
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet/tools/update_smf.py	Mon Nov 28 16:54:02 2016 -0800
@@ -0,0 +1,313 @@
+#!/usr/bin/python2.7
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+'''
+Utility program for helping with the upgrade of puppet to a newer
+version.  This program will take a puppet configuration file that
+has been generated via the command sequence
+
+puppet agent --genconfig > puppet.conf
+
+and use the data in that configuration file to replace the
+associated Puppet SMF user configuratable properties with the
+properties that are allowed in the new version of puppet
+
+NOTE: This file should not be included with the puppet release
+'''
+
+import os
+import re
+import sys
+import textwrap
+
+from lxml import etree
+from optparse import OptionParser
+
+
+COMMENT_PATTERN = re.compile(".*# ?(.*)")
+CONFIG_VALUE_PATTERN = re.compile("([\S]+)\s*=\s*(\S*)")
+
+DEFAULT_VALUE_STR = "The default value is "
+
+# SMF defined property types.  For a list of
+# all available types see
+# /usr/share/lib/xml/dtd/service_bundle.dtd.1
+TYPE_ASTRING = "astring"
+TYPE_BOOLEAN = "boolean"
+TYPE_INTEGER = "integer"
+TYPE_HOST = "host"
+TYPE_HOSTNAME = "hostname"
+TYPE_NETADDRESS = "net_address"
+TYPE_URI = "uri"
+
+
+# Dictionary of currently defined property types to associate
+# with a specified property.  Any property not defined here
+# is assumed to have a property type of astring, integer,
+# or boolean
+PROP_TYPE = {
+    'server': TYPE_HOST,
+    'archive_file_server': TYPE_HOST,
+    'bindaddress': TYPE_NETADDRESS,
+    'ca_server': TYPE_HOST,
+    'certname': TYPE_HOSTNAME,
+    'couchdb_url': TYPE_URI,
+    'dbserver': TYPE_HOST,
+    'dns_alt_names': TYPE_HOST,
+    'http_proxy_host': TYPE_HOST,
+    'inventory_server': TYPE_HOST,
+    'ldapserver': TYPE_HOST,
+    'ldapuser': TYPE_HOSTNAME,
+    'module_repository': TYPE_URI,
+    'queue_source': TYPE_URI,
+    'report_server': TYPE_HOST,
+    'reporturl': TYPE_URI,
+    'smtpserver': TYPE_HOST,
+    'srv_domain': TYPE_HOST,
+}
+
+# Dictionary used to hold properites and the resulting xml code
+PUPPET_CONFIG_DICT = dict()
+
+
+def err(msg):
+    '''Output standard error message'''
+    # Duplicate the syntax of the parser.error
+    sys.stderr.write("%(prog)s: error: %(msg)s\n" %
+                     {"prog": os.path.basename(sys.argv[0]), "msg": msg})
+
+
+def create_config_element(key, key_type, desc_text):
+    '''Create a basic xml entry following the basic pattern of
+
+        <prop_pattern name='${key}' type='${key_type}'
+                required='false'>
+                    <description> <loctext xml:lang='C'>
+                         ${desc_text}
+                    </loctext> </description>
+        </prop_pattern>
+    '''
+    prop_pattern = etree.Element(
+        "prop_pattern",
+        name=key,
+        type=key_type,
+        required="false")
+    desc = etree.SubElement(prop_pattern, "description")
+    loctext = etree.SubElement(desc, "loctext")
+    loctext.text = "\n%s\n\t    " % desc_text
+    loctext.set('{http://www.w3.org/XML/1998/namespace}lang', 'C')
+    return prop_pattern
+
+
+def determine_type(key, value):
+    '''Determine the xml property type to associate with the
+       specified key
+    '''
+
+    # Does the key have a specified xml property type
+    # already defined?
+    try:
+        return PROP_TYPE[key]
+    except KeyError:
+        pass
+
+    # Use the value to determine the xml property type
+    if value.isdigit():
+        return TYPE_INTEGER
+    if value.lower() in ['false', 'true']:
+        return TYPE_BOOLEAN
+    return TYPE_ASTRING
+
+
+def process_grouping(lines):
+    '''Process the lines in the list.  The last entry should be
+       a 'key=value' entry
+    '''
+
+    # The last field should be a key = value pair
+    # If it's not then the format of the file is not matching
+    # the expected format of
+    #
+    # Description
+    # The default value is "xxxx"
+    # key = value
+    #
+    key_value = lines.pop()
+    match = CONFIG_VALUE_PATTERN.match(key_value)
+    if not match:
+        raise TypeError("Last line in grouping is not in expected "
+                        "format of 'key = value'\n%s" %
+                        "\n".join(lines))
+    key = match.group(1)
+    value = match.group(2)
+
+    default_value_line = lines.pop()
+    if not default_value_line.startswith(DEFAULT_VALUE_STR):
+        # Not a match.  Last line was still part of the description
+        lines.append(default_value_line)
+
+    key_type = determine_type(key, value)
+
+    # remaining lines are the descriptor field
+    desc = textwrap.fill("\n".join(lines),79)
+    PUPPET_CONFIG_DICT[key] = (key, key_type, desc)
+
+
+def parse_puppet_config(filename):
+    '''Parse the puppet configuration file that is generated by
+       puppet agent --genconfig
+    '''
+    parameter_list = []
+    agent_check = True
+    with open(filename, 'r') as f_handle:
+        for line in f_handle:
+            if agent_check:
+                if line.startswith("[agent]"):
+                    # Throw away the initial starting block code in the
+                    del parameter_list[:]
+                    agent_check = False
+                    continue
+            line = line.strip().replace("\n", "")
+            if not line:
+                # If parameter_list is not empty, process the data and
+                # generate an xml structure
+                process_grouping(parameter_list)
+                # Done processing, delete all the saved entries
+                del parameter_list[:]
+                continue
+
+            match = COMMENT_PATTERN.match(line)
+            if match:
+                line = match.group(1)
+            parameter_list.append(line)
+    f_handle.close()
+
+
+def update_smf_file(smf_xml_file, output_file):
+    '''Replace the puppet property definitions in the specified SMF
+       file with those that are stored in PUPPET_CONFIG_DICT
+    '''
+
+    try:
+        parser = etree.XMLParser(remove_blank_text=True)
+        tree = etree.parse(smf_xml_file, parser)
+        root = tree.getroot()
+        template = root.find("service/template")
+        puppet_desc = template.find("common_name/loctext")
+        puppet_desc.text = "Puppet"
+
+        pg_pattern = template.find("pg_pattern")
+    except IOError as msg:
+        err(msg)
+        return -1
+    except etree.XMLSyntaxError as msg:
+        err(msg)
+        return -1
+    except NameError as msg:
+        err("XML file %s does not match expected formated" % smf_xml_file)
+
+    # Delete the pg_pattern nodes and it's children
+    # This is the structure that will be rebuilt based
+    # on the genconfig information that was read in
+    if pg_pattern is not None:
+        template.remove(pg_pattern)
+
+    # <pg_pattern name='config' type='application' required='false'>
+    pg_pattern = etree.SubElement(
+        template,
+        "pg_pattern",
+        name="config",
+        type="application",
+        required="false")
+    for key in sorted(PUPPET_CONFIG_DICT.iterkeys()):
+        values = PUPPET_CONFIG_DICT[key]
+        element = create_config_element(values[0], values[1], values[2])
+        pg_pattern.append(element)
+
+    # Write out the contents of the updated puppet SMF config file
+    print "Writting out contents of new SMF configuration file to: %s" % \
+        output_file
+    with open(output_file, "w") as f_handle:
+        f_handle.write(etree.tostring(tree, pretty_print=True))
+    f_handle.close()
+
+
+def option_list():
+    '''Build the option list for this utility'''
+    desc = "Utility for assisting in the upgrading of Solaris Puppet SMF file"
+    usage = "usage: %prog -c <puppet_config_file> -s <smf_confilg_file> " \
+            "[-o <output_file>]\n"
+    opt_list = OptionParser(description=desc, usage=usage)
+
+    opt_list.add_option("-c", "--config", dest="config", default=None,
+                        action="store", type="string", nargs=1,
+                        metavar="<puppet_config_file>",
+                        help="Puppet configuration file generated via"
+                             "genconfig option to puppet. i.e. "
+                             "puppet agent --genconfig > puppet.conf")
+    opt_list.add_option("-s", "--smf", dest="smf_xml", default=None,
+                        action="store", type="string", nargs=1,
+                        metavar="<smf_config_file>",
+                        help="Current solaris Puppet SMF XML configuration"
+                             " file. This file is located in <userland_tree>"
+                             "/components/puppet/files/puppet.xml")
+    opt_list.add_option("-o", "--output", dest="output", default=None,
+                        action="store", type="string", nargs=1,
+                        metavar="<output_file>",
+                        help="The name of the new puppet.xml file ")
+    return opt_list
+
+
+def main():
+    '''Execute this utility based on the options supplied by the user'''
+    parser = option_list()
+
+    (options, _args) = parser.parse_args()
+
+    if not options.config or not options.smf_xml or \
+            not options.output:
+        err("Required options not specified")
+        parser.print_help()
+        sys.exit(-1)
+
+    if not os.path.isfile(options.config):
+        err("%s does not exist or is not a regular file\n"
+            % options.config)
+        sys.exit(-1)
+    if not os.path.isfile(options.smf_xml):
+        err("%s does not exist or is not a regular file\n"
+            % options.smf_xml)
+        sys.exit(-1)
+    if os.path.exists(options.output):
+        err("specified file %s already exist\n"
+            % options.output)
+        sys.exit(-1)
+
+    parse_puppet_config(options.config)
+    update_smf_file(options.smf_xml, options.output)
+
+if __name__ == '__main__':
+    main()
--- a/make-rules/prep-git.mk	Wed Jan 11 15:24:27 2017 -0800
+++ b/make-rules/prep-git.mk	Mon Nov 28 16:54:02 2016 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 GIT =		/usr/bin/git
@@ -60,7 +60,7 @@
 # remove those URLs.  If the primary (unsuffixed) archive is from github, then
 # we add a dummy __BLANK__ suffix to the list, and filter that out separately.
 ifeq (github,$(findstring github,$(GIT_REPO$(1))))
-  COMPONENT_ARCHIVE_URL$(1) ?= $(GIT_REPO$(1))/tarball/$(GIT_BRANCH$(1))
+  COMPONENT_ARCHIVE_URL$(1) ?= $(GIT_REPO$(1))/archive/$(GIT_BRANCH$(1)).tar.gz
   GITHUB_ARCHIVE_SUFFIXES += $(or $(strip $(1:_%=%)),__BLANK__)
 else
   COMPONENT_ARCHIVE_SRC$(1) = git
--- a/make-rules/puppetmodule.mk	Wed Jan 11 15:24:27 2017 -0800
+++ b/make-rules/puppetmodule.mk	Mon Nov 28 16:54:02 2016 -0800
@@ -43,8 +43,8 @@
 $(BUILD_DIR)/%/.installed:      $(BUILD_DIR)/%/.built
 	$(COMPONENT_PRE_INSTALL_ACTION)
 	(cd $(SOURCE_DIR); \
-		$(MKDIR) -p $(PROTO_DIR)/etc/puppet/modules/$(MODULE_NAME); \
-		$(CP) -R * $(PROTO_DIR)/etc/puppet/modules/$(MODULE_NAME))
+		$(MKDIR) -p $(PROTO_DIR)/usr/puppetlabs/puppet/modules/$(MODULE_NAME); \
+		$(CP) -R * $(PROTO_DIR)/usr/puppetlabs/puppet/modules/$(MODULE_NAME))
 	$(COMPONENT_POST_INSTALL_ACTION)
 	$(TOUCH) $@
upstream/oracle/userland-gate