23146903 Puppet and OpenStack modules need modification notices
authorPatrick Einheber <patrick.einheber@oracle.com>
Wed, 27 Apr 2016 14:55:10 -0700
changeset 5860 afd31ba91ee9
parent 5859 98bc99958997
child 5861 720358c56a5d
23146903 Puppet and OpenStack modules need modification notices
components/ruby/facter/patches/facter-03-FACT-658.patch
components/ruby/facter/patches/facter-04-FACT-660.patch
components/ruby/facter/patches/facter-05-FACT-662.patch
components/ruby/facter/patches/facter-06-21936192-ipaddress.patch
components/ruby/mcollective/patches/01-mco-client-config.patch
components/ruby/mcollective/patches/02-mco-server-config.patch
components/ruby/mcollective/patches/03-mco-service-name
components/ruby/puppet-modules/nanliu-staging/patches/01-metadata.patch
components/ruby/puppet-modules/openstack-cinder/patches/01-metadata.patch
components/ruby/puppet-modules/openstack-cinder/patches/02-params.patch
components/ruby/puppet-modules/openstack-cinder/patches/03-grep.patch
components/ruby/puppet-modules/openstack-glance/patches/01-metadata.patch
components/ruby/puppet-modules/openstack-glance/patches/02-params.patch
components/ruby/puppet-modules/openstack-glance/patches/03-init.patch
components/ruby/puppet-modules/openstack-glance/patches/04-registry.patch
components/ruby/puppet-modules/openstack-glance/patches/05-api.patch
components/ruby/puppet-modules/openstack-heat/patches/01-metadata.patch
components/ruby/puppet-modules/openstack-heat/patches/02-params.patch
components/ruby/puppet-modules/openstack-heat/patches/03-init.patch
components/ruby/puppet-modules/openstack-heat/patches/04-api.patch
components/ruby/puppet-modules/openstack-heat/patches/05-engine.patch
components/ruby/puppet-modules/openstack-horizon/patches/01-metadata.patch
components/ruby/puppet-modules/openstack-horizon/patches/02-params.patch
components/ruby/puppet-modules/openstack-horizon/patches/03-init.patch
components/ruby/puppet-modules/openstack-horizon/patches/04-template.patch
components/ruby/puppet-modules/openstack-horizon/patches/05-apache.patch
components/ruby/puppet-modules/openstack-ironic/patches/01-metadata.patch
components/ruby/puppet-modules/openstack-ironic/patches/02-params.patch
components/ruby/puppet-modules/openstack-keystone/patches/01-metadata.patch
components/ruby/puppet-modules/openstack-keystone/patches/02-params.patch
components/ruby/puppet-modules/openstack-keystone/patches/03-init.patch
components/ruby/puppet-modules/openstack-keystone/patches/04-client.patch
components/ruby/puppet-modules/openstack-neutron/patches/01-metadata.patch
components/ruby/puppet-modules/openstack-neutron/patches/02-params.patch
components/ruby/puppet-modules/openstack-neutron/patches/03-init.patch
components/ruby/puppet-modules/openstack-neutron/patches/04-vpnaas.patch
components/ruby/puppet-modules/openstack-neutron/patches/05-l3agent.patch
components/ruby/puppet-modules/openstack-neutron/patches/06-launchpad-1476680.patch
components/ruby/puppet-modules/openstack-nova/patches/01-metadata.patch
components/ruby/puppet-modules/openstack-nova/patches/02-params.patch
components/ruby/puppet-modules/openstack-nova/patches/03-init.patch
components/ruby/puppet-modules/openstack-nova/patches/04-generic-service.patch
components/ruby/puppet-modules/openstack-nova/patches/05-api.patch
components/ruby/puppet-modules/openstack-nova/patches/06-compute.patch
components/ruby/puppet-modules/openstack-openstacklib/patches/01-metadata.patch
components/ruby/puppet-modules/openstack-openstacklib/patches/02-openstackclient.patch
components/ruby/puppet-modules/openstack-swift/patches/01-metadata.patch
components/ruby/puppet-modules/openstack-swift/patches/02-params.patch
components/ruby/puppet-modules/openstack-swift/patches/03-init.patch
components/ruby/puppet-modules/openstack-swift/patches/04-proxy.patch
components/ruby/puppet-modules/openstack-swift/patches/05-remove-rsync-server.patch
components/ruby/puppet-modules/openstack-swift/patches/06-storage.patch
components/ruby/puppet-modules/puppetlabs-apache/patches/01-metadata.patch
components/ruby/puppet-modules/puppetlabs-apache/patches/02-params.patch
components/ruby/puppet-modules/puppetlabs-apache/patches/03-version.patch
components/ruby/puppet-modules/puppetlabs-apache/patches/04-init.patch
components/ruby/puppet-modules/puppetlabs-apache/patches/06-mod-prefork.patch
components/ruby/puppet-modules/puppetlabs-apache/patches/07-mpm.patch
components/ruby/puppet-modules/puppetlabs-apache/patches/08-default-mods.patch
components/ruby/puppet-modules/puppetlabs-apache/patches/09-mod-ssl.patch
components/ruby/puppet-modules/puppetlabs-concat/patches/01-metadata.patch
components/ruby/puppet-modules/puppetlabs-mysql/patches/01-installdb.patch
components/ruby/puppet-modules/puppetlabs-mysql/patches/02-params.patch
components/ruby/puppet-modules/puppetlabs-ntp/patches/01-metadata.patch
components/ruby/puppet-modules/puppetlabs-rabbitmq/patches/01-metadata.patch
components/ruby/puppet-modules/puppetlabs-rabbitmq/patches/02-params.patch
components/ruby/puppet-modules/puppetlabs-rabbitmq/patches/03-rabbitmqadmin.patch
components/ruby/puppet-modules/puppetlabs-rabbitmq/patches/04-erlang_cookie_ownership.patch
components/ruby/puppet-modules/puppetlabs-rabbitmq/patches/05-rabbitmqadmin-usr-local.patch
components/ruby/puppet-modules/puppetlabs-rsync/patches/01-metadata.patch
components/ruby/puppet-modules/saz-memcached/patches/01-metadata.patch
components/ruby/puppet-modules/saz-memcached/patches/02-params.patch
components/ruby/puppet/patches/puppet-00-s12pkg.patch
components/ruby/puppet/patches/puppet-01-installrb-nogzip-manpage.patch
components/ruby/puppet/patches/puppet-02-zone-type.patch
components/ruby/puppet/patches/puppet-03-zone-provider.patch
components/ruby/puppet/patches/puppet-04-agent-auditing.patch
components/ruby/puppet/patches/puppet-06-provider-smf.patch
components/ruby/puppet/patches/puppet-07-PUP-2641.patch
components/ruby/puppet/patches/puppet-08-PUP-2509.patch
components/ruby/puppet/patches/puppet-09-role-shell.patch
components/ruby/puppet/patches/puppet-10-smf-recursive-enable.patch
components/ruby/puppet/patches/puppet-11-smf-degraded.patch
components/ruby/puppet/patches/puppet-12-pkg-provider-latest.patch
--- a/components/ruby/facter/patches/facter-03-FACT-658.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/facter/patches/facter-03-FACT-658.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -1,8 +1,17 @@
 Patch for FACT-658 facter doesn't parse gnu uptime output
 Upstream bug: https://tickets.puppetlabs.com/browse/FACT-658
---- facter-2.1.0/lib/facter/util/uptime.rb.orig	2014-08-15 10:19:59.183717181 -0600
-+++ facter-2.1.0/lib/facter/util/uptime.rb	2014-08-15 10:44:49.611645182 -0600
[email protected]@ -76,6 +76,14 @@
+
+--- facter-2.4.6/lib/facter/util/uptime.rb.orig	2016-04-19 15:19:02.924027657 -0700
++++ facter-2.4.6/lib/facter/util/uptime.rb	2016-04-19 15:20:09.128836906 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ require 'time'
+ 
+ # A module to gather uptime facts
[email protected]@ -78,6 +82,14 @@
    end
  
    def self.uptime_executable_cmd
--- a/components/ruby/facter/patches/facter-04-FACT-660.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/facter/patches/facter-04-FACT-660.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -1,8 +1,17 @@
 Patch for FACT-660 Facter on Solaris 11.2+ should report if zones are supported
 Upstream bug: https://tickets.puppetlabs.com/browse/FACT-660
---- facter-2.1.0/lib/facter/util/solaris_zones.rb.orig	2014-08-19 13:49:14.721574641 -0600
-+++ facter-2.1.0/lib/facter/util/solaris_zones.rb	2014-08-19 13:50:03.475818042 -0600
[email protected]@ -156,3 +156,29 @@
+
+--- facter-2.4.6/lib/facter/util/solaris_zones.rb.orig	2016-04-19 15:21:42.808586315 -0700
++++ facter-2.4.6/lib/facter/util/solaris_zones.rb	2016-04-19 15:22:05.762477352 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ require 'facter/util/resolution'
+ 
+ module Facter
[email protected]@ -156,3 +160,29 @@
    end
  end
  end
--- a/components/ruby/facter/patches/facter-05-FACT-662.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/facter/patches/facter-05-FACT-662.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -1,8 +1,17 @@
 Patch for FACT-662 Extend ldom.rb to indicate whether ldom creation is supported
 Upstream bug: https://tickets.puppetlabs.com/browse/FACT-662
---- facter-2.1.0/lib/facter/ldom.rb.orig	2014-08-20 10:20:46.279840866 -0600
-+++ facter-2.1.0/lib/facter/ldom.rb	2014-08-20 10:25:26.560542193 -0600
[email protected]@ -46,4 +46,37 @@
+
+--- facter-2.4.6/lib/facter/ldom.rb.orig	2016-04-19 15:19:02.953948198 -0700
++++ facter-2.4.6/lib/facter/ldom.rb	2016-04-19 15:24:33.197245752 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # Fact: ldom
+ #
+ # Purpose:
[email protected]@ -48,4 +52,37 @@
        end
      end
    end
--- a/components/ruby/facter/patches/facter-06-21936192-ipaddress.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/facter/patches/facter-06-21936192-ipaddress.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -1,9 +1,18 @@
 Split from BSD method and add getent hosts
 Also don't try to run `host hostname` if the host command isn't available.
 No upstream facter 2.x is dead and new bugs are not being accepted.
---- facter-2.1.0/lib/facter/ipaddress.rb.orig	2015-10-02 13:17:19.199030743 -0400
-+++ facter-2.1.0/lib/facter/ipaddress.rb	2015-10-02 13:17:25.713426750 -0400
[email protected]@ -64,7 +64,7 @@
+
+--- facter-2.4.6/lib/facter/ipaddress.rb.orig	2016-04-19 15:19:02.958338799 -0700
++++ facter-2.4.6/lib/facter/ipaddress.rb	2016-04-19 15:27:05.519845908 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # Fact: ipaddress
+ #
+ # Purpose: Return the main IP address for a host.
[email protected]@ -64,7 +68,7 @@
  end
  
  Facter.add(:ipaddress) do
@@ -12,7 +21,7 @@
    setcode do
      ip = nil
      output = Facter::Util::IP.exec_ifconfig(["-a"])
[email protected]@ -84,6 +84,41 @@
[email protected]@ -84,6 +88,41 @@
  end
  
  Facter.add(:ipaddress) do
@@ -54,7 +63,7 @@
    confine :kernel => %w{AIX}
    setcode do
      ip = nil
[email protected]@ -152,8 +187,9 @@
[email protected]@ -150,8 +189,9 @@
  
  Facter.add(:ipaddress, :timeout => 2) do
    setcode do
--- a/components/ruby/mcollective/patches/01-mco-client-config.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/mcollective/patches/01-mco-client-config.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -6,9 +6,13 @@
 
 NOTE : This patch is developed in-house (and Solaris specific)
 
---- mcollective-2.8.2/etc/client.cfg.dist.orig	2015-05-14 08:50:32.000000000 -0700
-+++ mcollective-2.8.2/etc/client.cfg.dist	2016-04-08 12:02:52.333612186 -0700
[email protected]@ -1,20 +1,23 @@
+--- mcollective-2.8.2/etc/client.cfg.dist.orig	2016-04-20 09:42:43.785159244 -0700
++++ mcollective-2.8.2/etc/client.cfg.dist	2016-04-20 12:07:58.755907466 -0700
[email protected]@ -1,19 +1,26 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
  main_collective = mcollective
  collectives = mcollective
 -libdir = /usr/libexec/mcollective
@@ -39,4 +43,3 @@
  
  # Facts
  factsource = yaml
- plugin.yaml = /etc/mcollective/facts.yaml
--- a/components/ruby/mcollective/patches/02-mco-server-config.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/mcollective/patches/02-mco-server-config.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -6,9 +6,13 @@
 
 NOTE : This patch is developed in-house (and Solaris specific)
 
---- mcollective-2.8.2/etc/server.cfg.dist.orig	2015-05-14 08:50:32.000000000 -0700
-+++ mcollective-2.8.2/etc/server.cfg.dist	2016-04-08 12:04:13.523097348 -0700
[email protected]@ -1,7 +1,9 @@
+--- mcollective-2.8.2/etc/server.cfg.dist.orig	2016-04-20 12:36:27.556854540 -0700
++++ mcollective-2.8.2/etc/server.cfg.dist	2016-04-20 12:37:10.186932498 -0700
[email protected]@ -1,7 +1,13 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
  main_collective = mcollective
  collectives = mcollective
 -libdir = /usr/libexec/mcollective
@@ -20,7 +24,7 @@
  loglevel = info
  daemonize = 1
  
[email protected]@ -9,13 +11,14 @@
[email protected]@ -9,12 +15,13 @@
  securityprovider = psk
  plugin.psk = unset
  
@@ -40,4 +44,3 @@
  
  # Facts
  factsource = yaml
- plugin.yaml = /etc/mcollective/facts.yaml
--- a/components/ruby/mcollective/patches/03-mco-service-name	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/mcollective/patches/03-mco-service-name	Wed Apr 27 14:55:10 2016 -0700
@@ -1,6 +1,11 @@
---- mcollective-service-agent-75478ac81f80bfd5ebaab05fe5dc5b92d90af815/validator/service_name.rb.orig	2016-03-03 12:06:59.523158420 -0800
-+++ mcollective-service-agent-75478ac81f80bfd5ebaab05fe5dc5b92d90af815/validator/service_name.rb	2016-03-03 12:07:26.197744202 -0800
[email protected]@ -2,7 +2,7 @@
+--- mcollective-service-agent-75478ac81f80bfd5ebaab05fe5dc5b92d90af815/validator/service_name.rb.orig	2016-04-20 12:39:03.373816055 -0700
++++ mcollective-service-agent-75478ac81f80bfd5ebaab05fe5dc5b92d90af815/validator/service_name.rb	2016-04-20 12:39:40.471363771 -0700
[email protected]@ -1,8 +1,12 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ module MCollective
    module Validator
      class Service_nameValidator
        def self.validate(service_name)
--- a/components/ruby/puppet-modules/nanliu-staging/patches/01-metadata.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/nanliu-staging/patches/01-metadata.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -13,3 +13,12 @@
        ]
      },
      {
+
+--- nanliu-staging-1.0.3/README.md.orig	2016-04-27 11:13:28.848094173 -0700
++++ nanliu-staging-1.0.3/README.md	2016-04-27 11:21:23.209400826 -0700
[email protected]@ -1,3 +1,5 @@
++NOTE: Oracle has modified the originally distributed contents of metadata.json.
++
+ # Staging module for Puppet
+ 
+ Manages staging directory, along with download/extraction of compressed files.
--- a/components/ruby/puppet-modules/openstack-cinder/patches/01-metadata.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-cinder/patches/01-metadata.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -26,3 +26,12 @@
      }
    ],
    "description": "Installs and configures OpenStack Cinder (Block Storage)."
+
+--- openstack-cinder-6.1.0/README.md.orig	2016-04-27 11:17:12.024829187 -0700
++++ openstack-cinder-6.1.0/README.md	2016-04-27 11:22:18.054347137 -0700
[email protected]@ -1,3 +1,5 @@
++NOTE: Oracle has modified the originally distributed contents of metadata.json.
++
+ cinder
+ =======
+ 
--- a/components/ruby/puppet-modules/openstack-cinder/patches/02-params.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-cinder/patches/02-params.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,12 +2,20 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-cinder-6.1.0/manifests/params.pp.orig	2015-10-15 09:42:47.576607396 -0600
-+++ openstack-cinder-6.1.0/manifests/params.pp	2015-10-15 09:43:48.776845153 -0600
[email protected]@ -51,7 +51,24 @@ class cinder::params {
+--- openstack-cinder-6.1.0/manifests/params.pp.orig	2016-04-21 07:42:54.508653869 -0700
++++ openstack-cinder-6.1.0/manifests/params.pp	2016-04-21 07:43:26.330669185 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++####################################################################### 
++
+ # == Class: cinder::params
+ #
+ class cinder::params {
[email protected]@ -51,7 +55,24 @@
        }
      }
-
+ 
 +  } elsif($::osfamily == 'Solaris') {
 +    $package_name       = 'cloud/openstack/cinder'
 +    $client_package     = 'library/python/cinderclient'
--- a/components/ruby/puppet-modules/openstack-cinder/patches/03-grep.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-cinder/patches/03-grep.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -4,9 +4,17 @@
 The patch is not suitable for upstream and can be removed when
 /bin/grep enters this century.  See bug 22742880 for more information.
 
---- openstack-cinder-6.1.0/spec/defines/cinder_type_set_spec.rb.orig	Fri Jan 15 11:57:08 2016
-+++ openstack-cinder-6.1.0/spec/defines/cinder_type_set_spec.rb	Fri Jan 15 11:57:13 2016
[email protected]@ -19,7 +19,7 @@
+--- openstack-cinder-6.1.0/spec/defines/cinder_type_set_spec.rb.orig	2016-04-21 07:44:39.304234219 -0700
++++ openstack-cinder-6.1.0/spec/defines/cinder_type_set_spec.rb	2016-04-21 07:45:54.080994658 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ #Author: Andrew Woodward <[email protected]>
+ 
+ require 'spec_helper'
[email protected]@ -19,7 +23,7 @@
    it 'should have its execs' do
      is_expected.to contain_exec('cinder type-key sith set monchichi=hippo').with(
        :command => 'cinder type-key sith set monchichi=hippo',
@@ -15,9 +23,17 @@
        :environment => [
          'OS_TENANT_NAME=admin',
          'OS_USERNAME=admin',
---- openstack-cinder-6.1.0/spec/defines/cinder_type_spec.rb.orig	Fri Jan 15 11:57:13 2016
-+++ openstack-cinder-6.1.0/spec/defines/cinder_type_spec.rb	Fri Jan 15 11:57:19 2016
[email protected]@ -24,7 +24,7 @@
+--- openstack-cinder-6.1.0/spec/defines/cinder_type_spec.rb.orig	2016-04-21 07:44:43.458867297 -0700
++++ openstack-cinder-6.1.0/spec/defines/cinder_type_spec.rb	2016-04-21 07:45:36.053871835 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ #Author: Andrew Woodward <[email protected]>
+ 
+ require 'spec_helper'
[email protected]@ -24,7 +28,7 @@
          'OS_USERNAME=admin',
          'OS_PASSWORD=asdf',
          'OS_AUTH_URL=http://127.127.127.1:5000/v2.0/'],
@@ -26,9 +42,17 @@
        :require => 'Package[python-cinderclient]')
      is_expected.to contain_exec('cinder type-key hippo set volume_backend_name=name1')
      is_expected.to contain_exec('cinder type-key hippo set volume_backend_name=name2')
---- openstack-cinder-6.1.0/manifests/type_set.pp.orig	Fri Jan 15 11:57:19 2016
-+++ openstack-cinder-6.1.0/manifests/type_set.pp	Fri Jan 15 11:57:21 2016
[email protected]@ -58,7 +58,7 @@
+--- openstack-cinder-6.1.0/manifests/type_set.pp.orig	2016-04-21 07:44:47.661447131 -0700
++++ openstack-cinder-6.1.0/manifests/type_set.pp	2016-04-21 07:45:41.645429540 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # ==Define: cinder::type_set
+ #
+ # Assigns keys after the volume type is set.
[email protected]@ -58,7 +62,7 @@
    exec {"cinder type-key ${type} set ${key}=${name}":
      path        => ['/usr/bin', '/bin'],
      command     => "cinder type-key ${type} set ${key}=${name}",
@@ -37,9 +61,17 @@
      environment => concat($cinder_env, $region_env),
      require     => Package['python-cinderclient']
    }
---- openstack-cinder-6.1.0/manifests/type.pp.orig	Fri Jan 15 11:57:21 2016
-+++ openstack-cinder-6.1.0/manifests/type.pp	Fri Jan 15 11:57:27 2016
[email protected]@ -66,7 +66,7 @@
+--- openstack-cinder-6.1.0/manifests/type.pp.orig	2016-04-21 07:44:52.352619515 -0700
++++ openstack-cinder-6.1.0/manifests/type.pp	2016-04-21 07:45:48.039994336 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # == Define: cinder::type
+ #
+ # Creates cinder type and assigns backends.
[email protected]@ -66,7 +70,7 @@
  
    exec {"cinder type-create ${volume_name}":
      command     => "cinder type-create ${volume_name}",
--- a/components/ruby/puppet-modules/openstack-glance/patches/01-metadata.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-glance/patches/01-metadata.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -18,3 +18,12 @@
      }
    ],
    "description": "Installs and configures OpenStack Glance (Image Service)."
+
+--- openstack-glance-6.1.0/README.md.orig	2016-04-27 11:26:17.640775748 -0700
++++ openstack-glance-6.1.0/README.md	2016-04-27 11:25:41.091511562 -0700
[email protected]@ -1,3 +1,5 @@
++NOTE: Oracle has modified the originally distributed contents of metadata.json.
++
+ glance
+ =======
+ 
--- a/components/ruby/puppet-modules/openstack-glance/patches/02-params.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-glance/patches/02-params.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,9 +2,13 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-glance-6.1.0/manifests/params.pp.orig     2015-08-10 09:37:49.703015029 -0700
-+++ openstack-glance-6.1.0/manifests/params.pp   2015-08-10 09:38:51.370489635 -0700
[email protected]@ -1,14 +1,11 @@
+--- openstack-glance-6.1.0/manifests/params.pp.orig	2016-04-21 07:49:15.937218438 -0700
++++ openstack-glance-6.1.0/manifests/params.pp	2016-04-21 07:49:38.722449269 -0700
[email protected]@ -1,14 +1,15 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
  # these parameters need to be accessed from several locations and
  # should be considered to be constant
  class glance::params {
@@ -22,7 +26,7 @@
        $api_package_name      = 'openstack-glance'
        $registry_package_name = 'openstack-glance'
        $api_service_name      = 'openstack-glance-api'
[email protected]@ -21,6 +18,9 @@ class glance::params {
[email protected]@ -21,6 +22,9 @@
        }
      }
      'Debian': {
@@ -32,7 +36,7 @@
        $api_package_name      = 'glance-api'
        $registry_package_name = 'glance-registry'
        $api_service_name      = 'glance-api'
[email protected]@ -28,8 +28,19 @@ class glance::params {
[email protected]@ -28,8 +32,19 @@
        $db_sync_command       = 'glance-manage --config-file=/etc/glance/glance-registry.conf db_sync'
        $pyceph_package_name   = 'python-ceph'
      }
@@ -52,4 +56,4 @@
 +      fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily Solaris, RedHat, and Debian")
      }
    }
-
+ 
--- a/components/ruby/puppet-modules/openstack-glance/patches/03-init.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-glance/patches/03-init.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,12 +2,20 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-glance-6.1.0/manifests/init.pp.orig     2015-08-10 09:39:41.906630428 -0700
-+++ openstack-glance-6.1.0/manifests/init.pp     2015-08-10 09:40:10.746985189 -0700
[email protected]@ -15,13 +15,6 @@ class glance(
-
+--- openstack-glance-6.1.0/manifests/init.pp.orig	2016-04-21 07:51:03.237198178 -0700
++++ openstack-glance-6.1.0/manifests/init.pp	2016-04-21 07:51:32.893728947 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # == class: glance
+ #
+ # base glance config.
[email protected]@ -15,13 +19,6 @@
+ 
    include ::glance::params
-
+ 
 -  file { '/etc/glance/':
 -    ensure => directory,
 -    owner  => 'glance',
--- a/components/ruby/puppet-modules/openstack-glance/patches/04-registry.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-glance/patches/04-registry.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,18 +2,26 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-glance-6.1.0/manifests/registry.pp.orig 2015-08-10 09:42:54.166718964 -0700
-+++ openstack-glance-6.1.0/manifests/registry.pp 2015-08-10 09:43:04.061499589 -0700
[email protected]@ -171,7 +171,6 @@ class glance::registry(
+--- openstack-glance-6.1.0/manifests/registry.pp.orig	2016-04-21 07:52:19.885897917 -0700
++++ openstack-glance-6.1.0/manifests/registry.pp	2016-04-21 07:52:49.376252569 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # == Class: glance::registry
+ #
+ # Installs and configures glance-registry
[email protected]@ -171,7 +175,6 @@
      )
    }
-
+ 
 -  Package[$glance::params::registry_package_name] -> File['/etc/glance/']
    Package[$glance::params::registry_package_name] -> Glance_registry_config<||>
-
+ 
    Glance_registry_config<||> ~> Exec<| title == 'glance-manage db_sync' |>
[email protected]@ -179,9 +178,6 @@ class glance::registry(
-
[email protected]@ -179,9 +182,6 @@
+ 
    File {
      ensure  => present,
 -    owner   => 'glance',
--- a/components/ruby/puppet-modules/openstack-glance/patches/05-api.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-glance/patches/05-api.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,18 +2,26 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-glance-6.1.0/manifests/api.pp.orig        2015-08-10 09:41:12.485497819 -0700
-+++ openstack-glance-6.1.0/manifests/api.pp      2015-08-10 09:42:24.192123343 -0700
[email protected]@ -248,7 +248,6 @@ class glance::api(
+--- openstack-glance-6.1.0/manifests/api.pp.orig	2016-04-21 07:53:25.924267344 -0700
++++ openstack-glance-6.1.0/manifests/api.pp	2016-04-21 07:53:40.217588163 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # == Class glance::api
+ #
+ # Configure API service in glance
[email protected]@ -248,7 +252,6 @@
      )
    }
-
+ 
 -  Package[$glance::params::api_package_name] -> File['/etc/glance/']
    Package[$glance::params::api_package_name] -> Class['glance::policy']
    Package[$glance::params::api_package_name] -> Glance_api_config<||>
    Package[$glance::params::api_package_name] -> Glance_cache_config<||>
[email protected]@ -265,9 +264,6 @@ class glance::api(
-
[email protected]@ -265,9 +268,6 @@
+ 
    File {
      ensure  => present,
 -    owner   => 'glance',
--- a/components/ruby/puppet-modules/openstack-heat/patches/01-metadata.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-heat/patches/01-metadata.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -18,3 +18,12 @@
      }
    ],
    "description": "Installs and configures OpenStack Heat (Orchestration)."
+
+--- openstack-heat-6.1.0/README.md.orig	2016-04-27 11:27:38.775478579 -0700
++++ openstack-heat-6.1.0/README.md	2016-04-27 11:28:00.603876454 -0700
[email protected]@ -1,3 +1,5 @@
++NOTE: Oracle has modified the originally distributed contents of metadata.json.
++
+ puppet-heat
+ =============
+ 
--- a/components/ruby/puppet-modules/openstack-heat/patches/02-params.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-heat/patches/02-params.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,9 +2,17 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-heat-6.1.0/manifests/params.pp.orig	2015-05-29 10:14:14.918710769 -0600
-+++ openstack-heat-6.1.0/manifests/params.pp	2015-05-29 10:14:53.068950697 -0600
[email protected]@ -45,10 +45,24 @@ class heat::params {
+--- openstack-heat-6.1.0/manifests/params.pp.orig	2016-04-21 08:02:17.732256206 -0700
++++ openstack-heat-6.1.0/manifests/params.pp	2016-04-21 08:02:43.009849321 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # == Class: heat::params
+ #
+ # Parameters for puppet-heat
[email protected]@ -45,10 +49,24 @@
          }
        }
      }
--- a/components/ruby/puppet-modules/openstack-heat/patches/03-init.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-heat/patches/03-init.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -1,9 +1,17 @@
 In-house patch to add support for Solaris 11.3 and 12.0.  This patch
 has been submitted and is in new versions of this module.
 
---- openstack-heat-6.1.0/manifests/init.pp.orig	2015-05-29 10:15:21.653268994 -0600
-+++ openstack-heat-6.1.0/manifests/init.pp	2015-05-29 10:15:55.528819621 -0600
[email protected]@ -265,30 +265,12 @@ class heat(
+--- openstack-heat-6.1.0/manifests/init.pp.orig	2016-04-21 08:04:30.412621338 -0700
++++ openstack-heat-6.1.0/manifests/init.pp	2016-04-21 08:05:31.892759394 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # == Class: heat
+ #
+ #  Heat base package & configuration
[email protected]@ -265,30 +269,12 @@
      require => Package['heat-common'],
    }
  
--- a/components/ruby/puppet-modules/openstack-heat/patches/04-api.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-heat/patches/04-api.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,12 +2,20 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-heat-6.1.0/manifests/api.pp.orig        2015-08-10 09:46:05.129811698 -0700
-+++ openstack-heat-6.1.0/manifests/api.pp      2015-08-10 09:47:39.509312624 -0700
[email protected]@ -62,12 +62,22 @@ class heat::api (
+--- openstack-heat-6.1.0/manifests/api.pp.orig	2016-04-21 08:06:35.984332200 -0700
++++ openstack-heat-6.1.0/manifests/api.pp	2016-04-21 08:06:51.351553847 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # == Class: heat::api
+ #
+ # Installs & configure the heat API service
[email protected]@ -62,12 +66,22 @@
    include ::heat::params
    include ::heat::policy
-
+ 
 +  if ( $heat::params::api_package_name != $heat::params::common_package_name ) {
 +    ensure_packages([$heat::params::api_package_name],
 +      {
@@ -20,20 +28,20 @@
 +
    Heat_config<||> ~> Service['heat-api']
    Class['heat::policy'] -> Service['heat-api']
-
+ 
 -  Package['heat-api'] -> Heat_config<||>
 -  Package['heat-api'] -> Class['heat::policy']
 -  Package['heat-api'] -> Service['heat-api']
 +  Package[$::heat::params::api_package_name] -> Heat_config<||>
 +  Package[$::heat::params::api_package_name] -> Class['heat::policy']
 +  Package[$::heat::params::api_package_name] -> Service['heat-api']
-
+ 
    if $use_ssl {
      if !$cert_file {
[email protected]@ -78,12 +88,6 @@ class heat::api (
[email protected]@ -78,12 +92,6 @@
      }
    }
-
+ 
 -  package { 'heat-api':
 -    ensure => $package_ensure,
 -    name   => $::heat::params::api_package_name,
@@ -43,7 +51,7 @@
    if $manage_service {
      if $enabled {
        $service_ensure = 'running'
[email protected]@ -99,7 +103,7 @@ class heat::api (
[email protected]@ -99,7 +107,7 @@
      hasstatus  => true,
      hasrestart => true,
      require    => [Package['heat-common'],
@@ -51,4 +59,4 @@
 +                  Package[$::heat::params::api_package_name]],
      subscribe  => $::heat::subscribe_sync_db,
    }
-
+ 
--- a/components/ruby/puppet-modules/openstack-heat/patches/05-engine.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-heat/patches/05-engine.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,12 +2,20 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-heat-6.1.0/manifests/engine.pp.orig       2015-08-10 09:48:29.999206790 -0700
-+++ openstack-heat-6.1.0/manifests/engine.pp   2015-08-10 09:51:44.134426445 -0700
[email protected]@ -109,16 +109,21 @@ class heat::engine (
+--- openstack-heat-6.1.0/manifests/engine.pp.orig	2016-04-21 08:07:38.280309372 -0700
++++ openstack-heat-6.1.0/manifests/engine.pp	2016-04-21 08:07:53.510837943 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # == Class: heat::engine
+ #
+ #  Installs & configure the heat engine service
[email protected]@ -109,16 +113,21 @@
    include ::heat
    include ::heat::params
-
+ 
 +  if ( $heat::params::engine_package_name != $heat::params::common_package_name ) {
 +    ensure_packages([$heat::params::engine_package_name],
 +      {
@@ -20,7 +28,7 @@
 +  }
 +
    Heat_config<||> ~> Service['heat-engine']
-
+ 
 -  Package['heat-engine'] -> Heat_config<||>
 -  Package['heat-engine'] -> Service['heat-engine']
 -  package { 'heat-engine':
@@ -31,10 +39,10 @@
 -  }
 +  Package[$::heat::params::engine_package_name] -> Heat_config<||>
 +  Package[$::heat::params::engine_package_name] -> Service['heat-engine']
-
+ 
    if $manage_service {
      if $enabled {
[email protected]@ -143,7 +148,7 @@ class heat::engine (
[email protected]@ -143,7 +152,7 @@
      hasrestart => true,
      require    => [ File['/etc/heat/heat.conf'],
                      Package['heat-common'],
@@ -42,4 +50,4 @@
 +                    Package[$::heat::params::engine_package_name]],
      subscribe  => $::heat::subscribe_sync_db,
    }
-
+ 
--- a/components/ruby/puppet-modules/openstack-horizon/patches/01-metadata.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-horizon/patches/01-metadata.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -18,3 +18,12 @@
      }
    ],
    "description": "Installs and configures OpenStack Horizon (Dashboard)."
+
+--- openstack-horizon-6.1.0/README.md.orig	2016-04-27 11:29:04.563218110 -0700
++++ openstack-horizon-6.1.0/README.md	2016-04-27 11:29:29.401646350 -0700
[email protected]@ -1,3 +1,5 @@
++NOTE: Oracle has modified the originally distributed contents of metadata.json.
++
+ horizon
+ =======
+ 
--- a/components/ruby/puppet-modules/openstack-horizon/patches/02-params.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-horizon/patches/02-params.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,12 +2,17 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-horizon-6.1.0/manifests/params.pp.orig	2015-04-23 15:14:49.613879625 -0600
-+++ openstack-horizon-6.1.0/manifests/params.pp	2015-04-23 15:18:41.786048628 -0600
[email protected]@ -2,12 +2,11 @@
+--- openstack-horizon-6.1.0/manifests/params.pp.orig	2016-04-21 08:10:05.499663309 -0700
++++ openstack-horizon-6.1.0/manifests/params.pp	2016-04-21 08:10:35.317952119 -0700
[email protected]@ -1,13 +1,16 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # these parameters need to be accessed from several locations and
  # should be considered to be constant
  class horizon::params {
-
+ 
 -  $logdir      = '/var/log/horizon'
 -  $django_wsgi = '/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi'
 -  $manage_py   = '/usr/share/openstack-dashboard/manage.py'
@@ -20,7 +25,7 @@
        $http_service                = 'httpd'
        $http_modwsgi                = 'mod_wsgi'
        $package_name                = 'openstack-dashboard'
[email protected]@ -21,6 +20,9 @@ class horizon::params {
[email protected]@ -21,6 +24,9 @@
        $wsgi_group                  = 'dashboard'
      }
      'Debian': {
@@ -30,7 +35,7 @@
        $http_service                = 'apache2'
        $config_file                 = '/etc/openstack-dashboard/local_settings.py'
        $httpd_listen_config_file    = '/etc/apache2/ports.conf'
[email protected]@ -40,8 +42,23 @@ class horizon::params {
[email protected]@ -40,8 +46,23 @@
          }
        }
      }
--- a/components/ruby/puppet-modules/openstack-horizon/patches/03-init.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-horizon/patches/03-init.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,9 +2,17 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-horizon-6.1.0/manifests/init.pp.orig     2015-08-10 09:54:19.189649729 -0700
-+++ openstack-horizon-6.1.0/manifests/init.pp     2015-08-10 09:58:21.391326841 -0700
[email protected]@ -201,6 +201,26 @@
+--- openstack-horizon-6.1.0/manifests/init.pp.orig	2016-04-21 08:11:23.146692638 -0700
++++ openstack-horizon-6.1.0/manifests/init.pp	2016-04-21 08:11:37.446431463 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # == Class: horizon
+ #
+ # Installs Horizon dashboard with Apache
[email protected]@ -201,6 +205,26 @@
  #    (optional) Tuskar-UI - Deployment mode ('poc' or 'scale')
  #    Defaults to 'scale'
  #
@@ -31,7 +39,7 @@
  # === Examples
  #
  #  class { 'horizon':
[email protected]@ -251,6 +271,11 @@ class horizon(
[email protected]@ -251,6 +275,11 @@
    $tuskar_ui_ironic_discoverd_url      = 'http://127.0.0.1:5050',
    $tuskar_ui_undercloud_admin_password = undef,
    $tuskar_ui_deployment_mode           = 'scale',
@@ -43,10 +51,10 @@
    # DEPRECATED PARAMETERS
    $can_set_mount_point                 = undef,
    $vhost_extra_params                  = undef,
[email protected]@ -314,18 +339,16 @@ class horizon(
[email protected]@ -314,18 +343,16 @@
      order   => '50',
    }
-
+ 
 -  package { 'python-lesscpy':
 -    ensure  => $package_ensure,
 -  }
@@ -62,15 +70,15 @@
 +      require     => [Package['python-lesscpy'], Package['horizon']],
 +    }
    }
-
+ 
 -  if $compress_offline {
 -    Concat[$::horizon::params::config_file] ~> Exec['refresh_horizon_django_cache']
 +  if $compress_offline and $::horizon::params::manage_py {
 +     File[$::horizon::params::config_file] ~> Exec['refresh_horizon_django_cache']
    }
-
+ 
    if $configure_apache {
[email protected]@ -338,6 +361,8 @@ class horizon(
[email protected]@ -338,6 +365,8 @@
        horizon_cert   => $horizon_cert,
        horizon_key    => $horizon_key,
        horizon_ca     => $horizon_ca,
--- a/components/ruby/puppet-modules/openstack-horizon/patches/04-template.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-horizon/patches/04-template.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,9 +2,17 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-horizon-6.1.0/templates/local_settings.py.erb.orig	2015-06-04 08:58:10.806056356 -0600
-+++ openstack-horizon-6.1.0/templates/local_settings.py.erb	2015-06-04 08:57:59.128875035 -0600
[email protected]@ -76,6 +76,9 @@ HORIZON_CONFIG = {
+--- openstack-horizon-6.1.0/templates/local_settings.py.erb.orig	2016-04-21 08:12:26.145429656 -0700
++++ openstack-horizon-6.1.0/templates/local_settings.py.erb	2016-04-21 08:12:49.285218471 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ import os
+ 
+ from django.utils.translation import ugettext_lazy as _
[email protected]@ -76,6 +80,9 @@
      'exceptions': {'recoverable': exceptions.RECOVERABLE,
                     'not_found': exceptions.NOT_FOUND,
                     'unauthorized': exceptions.UNAUTHORIZED},
@@ -12,9 +20,9 @@
 +    'customization_module': "<%= @overrides %>"
 +<% end %>
  }
-
+ 
  # Specify a regular expression to validate user passwords.
[email protected]@ -345,13 +348,6 @@ LOGGING = {
[email protected]@ -345,13 +352,6 @@
              'filename': '<%= scope.lookupvar("horizon::params::logdir") %>/horizon.log',
              'formatter': 'verbose',
          },
@@ -28,10 +36,10 @@
      },
      'loggers': {
          # Logging from django.db.backends is VERY verbose, send to null
[email protected]@ -574,14 +570,27 @@ LOGIN_URL = '<%= scope.lookupvar("horizo
[email protected]@ -574,14 +574,27 @@
  LOGOUT_URL = '<%= scope.lookupvar("horizon::params::root_url") %>/auth/logout/'
  LOGIN_REDIRECT_URL = '<%= scope.lookupvar("horizon::params::root_url") %>'
-
+ 
 -# The Ubuntu package includes pre-compressed JS and compiled CSS to allow
 -# offline compression by default.  To enable online compression, install
 -# the python-lesscpy package and disable the following option.
@@ -52,7 +60,7 @@
 +# online compression, install the python-lesscpy package and disable
 +# the following option.
  COMPRESS_OFFLINE = <%= @compress_offline.to_s.capitalize %>
-
+ 
 -# For Glance image upload, Horizon uses the file upload support from Django
 -# so we add this option to change the directory where uploaded files are temporarily
 -# stored until they are loaded into Glance.
@@ -60,5 +68,5 @@
 +# Django so we add this option to change the directory where uploaded
 +# files are temporarily stored until they are loaded into Glance.
  FILE_UPLOAD_TEMP_DIR = '<%= @file_upload_temp_dir %>'
-
+ 
  <% if @tuskar_ui %>
--- a/components/ruby/puppet-modules/openstack-horizon/patches/05-apache.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-horizon/patches/05-apache.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,9 +2,17 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-horizon-6.1.0/manifests/wsgi/apache.pp.orig       2015-08-10 09:59:25.006128695 -0700
-+++ openstack-horizon-6.1.0/manifests/wsgi/apache.pp   2015-08-10 10:01:46.943370519 -0700
[email protected]@ -56,6 +56,14 @@
+--- openstack-horizon-6.1.0/manifests/wsgi/apache.pp.orig	2016-04-21 08:13:33.829726153 -0700
++++ openstack-horizon-6.1.0/manifests/wsgi/apache.pp	2016-04-21 08:13:49.515281656 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # == Class: horizon::wsgi::apache
+ #
+ # Configures Apache WSGI for Horizon.
[email protected]@ -56,6 +60,14 @@
  #   (Optional) Description
  #   Defaults to 'horizon_ssl_vhost'.
  #
@@ -19,7 +27,7 @@
  # [*extra_params*]
  #   (optional) A hash of extra paramaters for apache::wsgi class.
  #   Defaults to {}
[email protected]@ -74,6 +82,8 @@ class horizon::wsgi::apache (
[email protected]@ -74,6 +86,8 @@
    $priority            = '15',
    $vhost_conf_name     = 'horizon_vhost',
    $vhost_ssl_conf_name = 'horizon_ssl_vhost',
@@ -27,11 +35,11 @@
 +  $static_alias        = '/usr/share/openstack-dashboard/static',
    $extra_params        = {},
  ) {
-
[email protected]@ -132,7 +142,11 @@ class horizon::wsgi::apache (
+ 
[email protected]@ -132,7 +146,11 @@
      $redirect_url   = $::horizon::params::root_url
    }
-
+ 
 -  Package['horizon'] -> Package[$::horizon::params::http_service]
 +  if $::osfamily == 'Solaris' {
 +    Package[$::horizon::params::package_name] -> Package['web/server/apache-24']
@@ -39,25 +47,25 @@
 +    Package['horizon'] -> Package[$::horizon::params::http_service]
 +  }
    File[$::horizon::params::config_file] ~> Service[$::horizon::params::http_service]
-
+ 
    $unix_user = $::osfamily ? {
[email protected]@ -150,7 +164,7 @@ class horizon::wsgi::apache (
[email protected]@ -150,7 +168,7 @@
      group   => $unix_group,
      before  => Service[$::horizon::params::http_service],
      mode    => '0751',
 -    require => Package['horizon'],
 +    require => Package[$::horizon::params::package_name],
    }
-
+ 
    file { "${::horizon::params::logdir}/horizon.log":
[email protected]@ -159,19 +173,19 @@ class horizon::wsgi::apache (
[email protected]@ -159,19 +177,19 @@
      group   => $unix_group,
      before  => Service[$::horizon::params::http_service],
      mode    => '0640',
 -    require => [ File[$::horizon::params::logdir], Package['horizon'] ],
 +    require => [ File[$::horizon::params::logdir], Package[$::horizon::params::package_name] ],
    }
-
+ 
    $default_vhost_conf_no_ip = {
      servername                  => $servername,
      serveraliases               => os_any2array($final_server_aliases),
--- a/components/ruby/puppet-modules/openstack-ironic/patches/01-metadata.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-ironic/patches/01-metadata.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -18,3 +18,12 @@
      }
    ],
    "description": "Installs and configures OpenStack Ironic (Bare metal)."
+
+--- openstack-ironic-6.1.0/README.md.orig	2016-04-27 12:10:55.565966448 -0700
++++ openstack-ironic-6.1.0/README.md	2016-04-27 12:11:09.408845368 -0700
[email protected]@ -1,3 +1,5 @@
++NOTE: Oracle has modified the originally distributed contents of metadata.json.
++
+ puppet-ironic
+ =============
+ 
--- a/components/ruby/puppet-modules/openstack-ironic/patches/02-params.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-ironic/patches/02-params.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,9 +2,17 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-ironic-6.1.0/manifests/params.pp.orig	2015-06-03 09:47:53.207517414 -0600
-+++ openstack-ironic-6.1.0/manifests/params.pp	2015-06-03 09:49:30.640143302 -0600
[email protected]@ -40,6 +40,14 @@ class ironic::params {
+--- openstack-ironic-6.1.0/manifests/params.pp.orig	2016-04-21 08:15:16.607432993 -0700
++++ openstack-ironic-6.1.0/manifests/params.pp	2016-04-21 08:15:42.830473689 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ #
+ # Copyright (C) 2013 eNovance SAS <[email protected]>
+ #
[email protected]@ -40,6 +44,14 @@
        $conductor_package   = 'ironic-conductor'
        $client_package      = 'python-ironicclient'
      }
--- a/components/ruby/puppet-modules/openstack-keystone/patches/01-metadata.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-keystone/patches/01-metadata.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -18,3 +18,12 @@
      }
    ],
    "description": "Installs and configures OpenStack Keystone (Identity)."
+
+--- openstack-keystone-6.1.0/README.md.orig	2016-04-27 12:12:22.955273591 -0700
++++ openstack-keystone-6.1.0/README.md	2016-04-27 12:12:32.758501010 -0700
[email protected]@ -1,3 +1,5 @@
++NOTE: Oracle has modified the originally distributed contents of metadata.json.
++
+ keystone
+ =======
+ 
--- a/components/ruby/puppet-modules/openstack-keystone/patches/02-params.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-keystone/patches/02-params.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -1,9 +1,15 @@
 In-house patch to add support for Solaris 11.3 and 12.0.  This patch
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
---- openstack-keystone-6.1.0/manifests/params.pp.~1~	2015-05-20 15:52:29.000000000 -0600
-+++ openstack-keystone-6.1.0/manifests/params.pp	2015-06-01 13:41:27.577020809 -0600
[email protected]@ -2,10 +2,10 @@
+
+--- openstack-keystone-6.1.0/manifests/params.pp.orig	2016-04-21 08:16:40.158969865 -0700
++++ openstack-keystone-6.1.0/manifests/params.pp	2016-04-21 08:16:54.897183391 -0700
[email protected]@ -1,11 +1,15 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ #
  # This class contains the platform differences for keystone
  #
  class keystone::params {
@@ -15,7 +21,7 @@
        $package_name                 = 'keystone'
        $service_name                 = 'keystone'
        $keystone_wsgi_script_path    = '/usr/lib/cgi-bin/keystone'
[email protected]@ -26,6 +26,7 @@ class keystone::params {
[email protected]@ -26,6 +30,7 @@
        }
      }
      'RedHat': {
@@ -23,7 +29,7 @@
        $package_name                 = 'openstack-keystone'
        $service_name                 = 'openstack-keystone'
        $keystone_wsgi_script_path    = '/var/www/cgi-bin/keystone'
[email protected]@ -34,5 +35,14 @@ class keystone::params {
[email protected]@ -34,5 +39,14 @@
        $keystone_wsgi_script_source  = '/usr/share/keystone/keystone.wsgi'
        $paste_config                 = '/usr/share/keystone/keystone-dist-paste.ini'
      }
--- a/components/ruby/puppet-modules/openstack-keystone/patches/03-init.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-keystone/patches/03-init.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,10 +2,18 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-keystone-6.1.0/manifests/init.pp.orig     2015-08-10 10:07:52.618276233 -0700
-+++ openstack-keystone-6.1.0/manifests/init.pp     2015-08-10 10:08:50.923010629 -0700
[email protected]@ -544,18 +544,12 @@ class keystone(
-
+--- openstack-keystone-6.1.0/manifests/init.pp.orig	2016-04-21 08:17:24.676149632 -0700
++++ openstack-keystone-6.1.0/manifests/init.pp	2016-04-21 08:17:38.287182985 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ #
+ # Module for managing keystone config.
+ #
[email protected]@ -544,18 +548,12 @@
+ 
    file { ['/etc/keystone', '/var/log/keystone', '/var/lib/keystone']:
      ensure  => directory,
 -    mode    => '0750',
@@ -14,7 +22,7 @@
      require => Package['keystone'],
      notify  => Service[$service_name],
    }
-
+ 
    file { '/etc/keystone/keystone.conf':
      ensure  => present,
 -    mode    => '0600',
--- a/components/ruby/puppet-modules/openstack-keystone/patches/04-client.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-keystone/patches/04-client.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,9 +2,17 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-keystone-6.1.0/manifests/client.pp.orig	2015-11-02 08:01:00.540540751 -0800
-+++ openstack-keystone-6.1.0/manifests/client.pp	2015-11-02 08:05:26.947491915 -0800
[email protected]@ -12,8 +12,15 @@ class keystone::client (
+--- openstack-keystone-6.1.0/manifests/client.pp.orig	2016-04-21 08:18:25.417368104 -0700
++++ openstack-keystone-6.1.0/manifests/client.pp	2016-04-21 08:18:42.546437765 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # == Class: keystone::client
+ #
+ # Installs Keystone client.
[email protected]@ -12,8 +16,15 @@
    $ensure = 'present'
  ) {
  
--- a/components/ruby/puppet-modules/openstack-neutron/patches/01-metadata.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-neutron/patches/01-metadata.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -27,3 +27,12 @@
      }
    ],
    "description": "Installs and configures OpenStack Neutron (Networking)."
+
+--- openstack-neutron-6.1.0/README.md.orig	2016-04-27 12:13:42.351790597 -0700
++++ openstack-neutron-6.1.0/README.md	2016-04-27 12:13:53.517298305 -0700
[email protected]@ -1,3 +1,5 @@
++NOTE: Oracle has modified the originally distributed contents of metadata.json.
++
+ neutron
+ ===================================
+ 
--- a/components/ruby/puppet-modules/openstack-neutron/patches/02-params.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-neutron/patches/02-params.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,9 +2,17 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-neutron-6.1.0/manifests/params.pp.orig	2015-05-29 10:42:11.939016221 -0600
-+++ openstack-neutron-6.1.0/manifests/params.pp	2015-05-29 10:55:54.281048159 -0600
[email protected]@ -153,6 +153,56 @@ class neutron::params {
+--- openstack-neutron-6.1.0/manifests/params.pp.orig	2016-04-21 08:20:20.670240920 -0700
++++ openstack-neutron-6.1.0/manifests/params.pp	2016-04-21 08:20:32.794568439 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ #
+ class neutron::params {
+ 
[email protected]@ -153,6 +157,56 @@
      $cliff_package      = 'python-cliff'
      $kernel_headers     = "linux-headers-${::kernelrelease}"
  
--- a/components/ruby/puppet-modules/openstack-neutron/patches/03-init.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-neutron/patches/03-init.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,9 +2,17 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-neutron-6.1.0/manifests/init.pp.orig     2015-08-10 10:15:41.992660410 -0700
-+++ openstack-neutron-6.1.0/manifests/init.pp     2015-08-10 10:16:24.401836047 -0700
[email protected]@ -235,7 +235,7 @@ class neutron (
+--- openstack-neutron-6.1.0/manifests/init.pp.orig	2016-04-21 08:21:08.360074819 -0700
++++ openstack-neutron-6.1.0/manifests/init.pp	2016-04-21 08:21:20.105597308 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # == Class: neutron
+ #
+ # Installs the neutron package and configures
[email protected]@ -235,7 +239,7 @@
    $allow_sorting               = false,
    $allow_overlapping_ips       = false,
    $api_extensions_path         = undef,
@@ -13,10 +21,10 @@
    $report_interval             = '30',
    $memcache_servers            = false,
    $control_exchange            = 'neutron',
[email protected]@ -312,18 +312,6 @@ class neutron (
[email protected]@ -312,18 +316,6 @@
      validate_array($memcache_servers)
    }
-
+ 
 -  File {
 -    require => Package['neutron'],
 -    owner   => 'root',
@@ -32,18 +40,18 @@
    package { 'neutron':
      ensure => $package_ensure,
      name   => $::neutron::params::package_name,
[email protected]@ -351,7 +339,6 @@ class neutron (
[email protected]@ -351,7 +343,6 @@
      'DEFAULT/api_extensions_path':     value => $api_extensions_path;
      'DEFAULT/state_path':              value => $state_path;
      'DEFAULT/lock_path':               value => $lock_path;
 -    'agent/root_helper':               value => $root_helper;
      'agent/report_interval':           value => $report_interval;
    }
-
[email protected]@ -374,6 +361,12 @@ class neutron (
+ 
[email protected]@ -374,6 +365,12 @@
      }
    }
-
+ 
 +  if $root_helper {
 +    neutron_config {
 +      'agent/root_helper':               value => $root_helper;
--- a/components/ruby/puppet-modules/openstack-neutron/patches/04-vpnaas.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-neutron/patches/04-vpnaas.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -1,9 +1,17 @@
 In-house patch to allow the vpnaas agent to configure the Solaris driver properties
 Currently unsuitable for upsteam contribution.
 
---- openstack-neutron-6.1.0/manifests/agents/vpnaas.pp.orig	Thu Oct 15 08:03:13 2015
-+++ openstack-neutron-6.1.0/manifests/agents/vpnaas.pp	Fri Mar 11 14:46:06 2016
[email protected]@ -43,6 +43,12 @@
+--- openstack-neutron-6.1.0/manifests/agents/vpnaas.pp.orig	2016-04-21 08:22:00.590665221 -0700
++++ openstack-neutron-6.1.0/manifests/agents/vpnaas.pp	2016-04-21 08:22:13.759565285 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ #
+ # Copyright (C) 2013 eNovance SAS <[email protected]>
+ #
[email protected]@ -43,6 +47,12 @@
  # [*ipsec_status_check_interval*]
  #   (optional) Status check interval. Defaults to '60'.
  #
@@ -16,7 +24,7 @@
  class neutron::agents::vpnaas (
    $package_ensure              = present,
    $enabled                     = true,
[email protected]@ -50,7 +56,9 @@
[email protected]@ -50,7 +60,9 @@
    $vpn_device_driver           = 'neutron.services.vpn.device_drivers.ipsec.OpenSwanDriver',
    $interface_driver            = 'neutron.agent.linux.interface.OVSInterfaceDriver',
    $external_network_bridge     = undef,
@@ -27,7 +35,7 @@
  ) {
  
    include ::neutron::params
[email protected]@ -66,6 +74,15 @@
[email protected]@ -66,6 +78,15 @@
          name   => $::neutron::params::openswan_package,
        }
      }
--- a/components/ruby/puppet-modules/openstack-neutron/patches/05-l3agent.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-neutron/patches/05-l3agent.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -1,9 +1,17 @@
 In-house patch for Solaris L3 agent driver configuration variables.
 This patch is not currently suitable for upstream contribution.
 
---- openstack-neutron-6.1.0/manifests/agents/l3.pp.orig	Fri Mar 11 15:26:19 2016
-+++ openstack-neutron-6.1.0/manifests/agents/l3.pp	Fri Mar 11 15:27:59 2016
[email protected]@ -99,6 +99,14 @@
+--- openstack-neutron-6.1.0/manifests/agents/l3.pp.orig	2016-04-21 08:23:04.952418874 -0700
++++ openstack-neutron-6.1.0/manifests/agents/l3.pp	2016-04-21 08:23:19.798506700 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # == Class: neutron::agents::l3
+ #
+ # Installs and configures the Neutron L3 service
[email protected]@ -99,6 +103,14 @@
  #   'dvr_snat': enable DVR with centralized SNAT support (DVR for single-host, for testing only)
  #   Defaults to 'legacy'
  #
@@ -18,7 +26,7 @@
  # [*allow_automatic_l3agent_failover*]
  #   DEPRECATED: Has no effect in this class. Use the same parameter in neutron::server instead.
  #
[email protected]@ -161,6 +169,9 @@
[email protected]@ -161,6 +173,9 @@
      'DEFAULT/enable_metadata_proxy':            value => $enable_metadata_proxy;
      'DEFAULT/router_delete_namespaces':         value => $router_delete_namespaces;
      'DEFAULT/agent_mode':                       value => $agent_mode;
--- a/components/ruby/puppet-modules/openstack-neutron/patches/06-launchpad-1476680.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-neutron/patches/06-launchpad-1476680.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -13,16 +13,18 @@
 
 Change-Id: I36149b42943238dc342f8c6e71c1261f00e01c4a
 Closes-bug: #1476680
----
- lib/puppet/provider/neutron_network/neutron.rb     |  2 +-
- spec/unit/provider/neutron_network/neutron_spec.rb | 28 +++++++++++++++++++++-
- 2 files changed, 28 insertions(+), 2 deletions(-)
 
-diff --git a/lib/puppet/provider/neutron_network/neutron.rb b/lib/puppet/provider/neutron_network/neutron.rb
-index b1ef753..b13ec00 100644
---- openstack-neutron-6.1.0/lib/puppet/provider/neutron_network/neutron.rb.orig
-+++ openstack-neutron-6.1.0/lib/puppet/provider/neutron_network/neutron.rb
[email protected]@ -53,7 +53,7 @@ Puppet::Type.type(:neutron_network).provide(
+--- openstack-neutron-6.1.0/lib/puppet/provider/neutron_network/neutron.rb.orig	2016-04-21 08:24:23.864059475 -0700
++++ openstack-neutron-6.1.0/lib/puppet/provider/neutron_network/neutron.rb	2016-04-21 08:25:01.467129260 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ require File.join(File.dirname(__FILE__), '..','..','..',
+                   'puppet/provider/neutron')
+ 
[email protected]@ -53,7 +57,7 @@
    def create
      network_opts = Array.new
  
@@ -31,11 +33,17 @@
        network_opts << '--shared'
      end
  
-diff --git a/spec/unit/provider/neutron_network/neutron_spec.rb b/spec/unit/provider/neutron_network/neutron_spec.rb
-index d01a009..b3b939e 100644
---- openstack-neutron-6.1.0/spec/unit/provider/neutron_network/neutron_spec.rb.orig
-+++ openstack-neutron-6.1.0/spec/unit/provider/neutron_network/neutron_spec.rb
[email protected]@ -31,7 +31,33 @@ describe provider_class do
+--- openstack-neutron-6.1.0/spec/unit/provider/neutron_network/neutron_spec.rb.orig	2016-04-21 08:24:29.372659168 -0700
++++ openstack-neutron-6.1.0/spec/unit/provider/neutron_network/neutron_spec.rb	2016-04-21 08:25:06.247381103 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ require 'puppet'
+ require 'spec_helper'
+ require 'puppet/provider/neutron_network/neutron'
[email protected]@ -31,7 +35,33 @@
  
    shared_examples 'neutron_network' do
  
@@ -70,6 +78,3 @@
  
        it 'should call net-create with appropriate command line options' do
          provider.class.stubs(:get_tenant_id).returns(net_attrs[:tenant_id])
--- 
-1.9.1
-
--- a/components/ruby/puppet-modules/openstack-nova/patches/01-metadata.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-nova/patches/01-metadata.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -27,3 +27,12 @@
      }
    ],
    "description": "Installs and configures OpenStack Nova (Compute)."
+
+--- openstack-nova-6.1.0/README.md.orig	2016-04-27 12:14:40.022335012 -0700
++++ openstack-nova-6.1.0/README.md	2016-04-27 12:14:49.534359893 -0700
[email protected]@ -1,3 +1,5 @@
++NOTE: Oracle has modified the originally distributed contents of metadata.json.
++
+ nova
+ ====
+ 
--- a/components/ruby/puppet-modules/openstack-nova/patches/02-params.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-nova/patches/02-params.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,9 +2,17 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-nova-6.1.0/manifests/params.pp.orig	2015-07-07 12:24:18.609643411 -0700
-+++ openstack-nova-6.1.0/manifests/params.pp	2015-07-07 12:24:51.583277575 -0700
[email protected]@ -116,8 +116,39 @@ class nova::params {
+--- openstack-nova-6.1.0/manifests/params.pp.orig	2016-04-21 08:27:23.127308760 -0700
++++ openstack-nova-6.1.0/manifests/params.pp	2016-04-21 08:27:36.640126549 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # == Class: nova::params
+ #
+ # These parameters need to be accessed from several locations and
[email protected]@ -116,8 +120,39 @@
          }
        }
      }
@@ -44,4 +52,4 @@
 +      fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily Solaris, RedHat, and Debian")
      }
    }
-
+ 
--- a/components/ruby/puppet-modules/openstack-nova/patches/03-init.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-nova/patches/03-init.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,12 +2,20 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-nova-6.1.0/manifests/init.pp.orig     2015-08-10 11:07:11.797692743 -0700
-+++ openstack-nova-6.1.0/manifests/init.pp     2015-08-10 11:08:05.453328148 -0700
[email protected]@ -397,12 +397,6 @@ class nova(
+--- openstack-nova-6.1.0/manifests/init.pp.orig	2016-04-21 08:28:14.920659366 -0700
++++ openstack-nova-6.1.0/manifests/init.pp	2016-04-21 08:28:26.073126710 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # == Class: nova
+ #
+ # This class is used to specify configuration parameters that are common
[email protected]@ -397,12 +401,6 @@
    Package['nova-common'] -> Nova_config<| |> -> File['/etc/nova/nova.conf']
    Nova_config<| |> ~> Exec['post-nova_config']
-
+ 
 -  # TODO - see if these packages can be removed
 -  # they should be handled as package deps by the OS
 -  package { 'python-greenlet':
@@ -17,10 +25,10 @@
    if $install_utilities {
      class { '::nova::utilities': }
    }
[email protected]@ -411,23 +405,14 @@ class nova(
[email protected]@ -411,23 +409,14 @@
    # allowing a resource to serve as a point where the configuration of nova begins
    anchor { 'nova-start': }
-
+ 
 -  package { 'python-nova':
 -    ensure  => $ensure_package,
 -    require => Package['python-greenlet'],
@@ -34,15 +42,15 @@
 +    require => Anchor['nova-start'],
      tag     => ['openstack'],
    }
-
+ 
    file { '/etc/nova/nova.conf':
 -    mode    => '0640',
 -    owner   => 'nova',
 -    group   => 'nova',
      require => Package['nova-common'],
    }
-
[email protected]@ -576,9 +561,6 @@ class nova(
+ 
[email protected]@ -576,9 +565,6 @@
    if $log_dir {
      file { $log_dir:
        ensure  => directory,
--- a/components/ruby/puppet-modules/openstack-nova/patches/04-generic-service.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-nova/patches/04-generic-service.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,12 +2,20 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-nova-6.1.0/manifests/generic_service.pp.orig	2015-07-07 12:28:25.529079509 -0700
-+++ openstack-nova-6.1.0/manifests/generic_service.pp	2015-07-07 12:29:11.890950696 -0700
[email protected]@ -79,7 +79,7 @@ define nova::generic_service(
+--- openstack-nova-6.1.0/manifests/generic_service.pp.orig	2016-04-21 08:29:00.221923911 -0700
++++ openstack-nova-6.1.0/manifests/generic_service.pp	2016-04-21 08:29:13.981164142 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # == Define: nova::generic_service
+ #
+ # This defined type implements basic nova services.
[email protected]@ -79,7 +83,7 @@
        }
      }
-
+ 
 -    service { $nova_title:
 +    service { $service_name:
        ensure    => $service_ensure,
--- a/components/ruby/puppet-modules/openstack-nova/patches/05-api.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-nova/patches/05-api.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,9 +2,17 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-nova-6.1.0/manifests/api.pp.orig	2015-06-02 16:38:11.660665302 -0600
-+++ openstack-nova-6.1.0/manifests/api.pp	2015-06-02 16:39:18.786748191 -0600
[email protected]@ -195,8 +195,8 @@ class nova::api(
+--- openstack-nova-6.1.0/manifests/api.pp.orig	2016-04-21 08:29:47.808392108 -0700
++++ openstack-nova-6.1.0/manifests/api.pp	2016-04-21 08:30:04.868712046 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # == Class: nova::api
+ #
+ # Setup and configure the Nova API endpoint
[email protected]@ -195,8 +199,8 @@
  
    Nova_paste_api_ini<| |> ~> Exec['post-nova_config']
  
--- a/components/ruby/puppet-modules/openstack-nova/patches/06-compute.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-nova/patches/06-compute.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,9 +2,17 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-nova-6.1.0/manifests/compute.pp.orig	2015-06-02 17:00:39.019478510 -0600
-+++ openstack-nova-6.1.0/manifests/compute.pp	2015-06-02 17:00:45.549532867 -0600
[email protected]@ -207,10 +207,6 @@ class nova::compute (
+--- openstack-nova-6.1.0/manifests/compute.pp.orig	2016-04-21 08:30:36.200699179 -0700
++++ openstack-nova-6.1.0/manifests/compute.pp	2016-04-21 08:30:51.264416908 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # == Class: nova::compute
+ #
+ # Installs the nova-compute service
[email protected]@ -207,10 +211,6 @@
      }
    }
  
--- a/components/ruby/puppet-modules/openstack-openstacklib/patches/01-metadata.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-openstacklib/patches/01-metadata.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -28,3 +28,12 @@
      }
    ],
    "description": "Puppet module library to expose common functionality between OpenStack modules."
+
+--- openstack-openstacklib-6.1.0/README.md.orig	2016-04-27 12:15:45.286079312 -0700
++++ openstack-openstacklib-6.1.0/README.md	2016-04-27 12:15:54.419984548 -0700
[email protected]@ -1,3 +1,5 @@
++NOTE: Oracle has modified the originally distributed contents of metadata.json.
++
+ openstacklib
+ ============
+ 
--- a/components/ruby/puppet-modules/openstack-openstacklib/patches/02-openstackclient.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-openstacklib/patches/02-openstackclient.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,9 +2,17 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-openstacklib-6.1.0/manifests/openstackclient.pp.orig	2015-06-05 16:06:39.223700269 -0600
-+++ openstack-openstacklib-6.1.0/manifests/openstackclient.pp	2015-06-05 16:08:35.218161669 -0600
[email protected]@ -10,9 +10,16 @@
+--- openstack-openstacklib-6.1.0/manifests/openstackclient.pp.orig	2016-04-21 08:31:49.221125868 -0700
++++ openstack-openstacklib-6.1.0/manifests/openstackclient.pp	2016-04-21 08:32:02.081222396 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # == Class: openstacklib::openstackclient
+ #
+ # Installs the openstackclient
[email protected]@ -10,9 +14,16 @@
  #
  class openstacklib::openstackclient(
    $package_ensure = 'present',
--- a/components/ruby/puppet-modules/openstack-swift/patches/01-metadata.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-swift/patches/01-metadata.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -26,3 +26,12 @@
      }
    ],
    "description": "Installs and configures OpenStack Swift (Object Storage)."
+
+--- openstack-swift-6.1.0/README.md.orig	2016-04-27 12:16:38.368953504 -0700
++++ openstack-swift-6.1.0/README.md	2016-04-27 12:16:47.335339012 -0700
[email protected]@ -1,3 +1,5 @@
++NOTE: Oracle has modified the originally distributed contents of metadata.json.
++
+ swift
+ =======
+ 
--- a/components/ruby/puppet-modules/openstack-swift/patches/02-params.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-swift/patches/02-params.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,9 +2,17 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-swift-6.1.0/manifests/params.pp.orig	2015-05-29 11:36:03.646990312 -0600
-+++ openstack-swift-6.1.0/manifests/params.pp	2015-05-29 11:36:37.616190956 -0600
[email protected]@ -52,6 +52,29 @@ class swift::params {
+--- openstack-swift-6.1.0/manifests/params.pp.orig	2016-04-21 08:33:03.312647988 -0700
++++ openstack-swift-6.1.0/manifests/params.pp	2016-04-21 08:33:26.608565136 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # == Class: swift::params
+ #
+ class swift::params {
[email protected]@ -52,6 +56,29 @@
        $service_provider                  = undef
        $swift3                            = 'openstack-swift-plugin-swift3'
      }
--- a/components/ruby/puppet-modules/openstack-swift/patches/03-init.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-swift/patches/03-init.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,9 +2,14 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-swift-6.1.0/manifests/init.pp.orig     2015-08-10 11:12:30.293187329 -0700
-+++ openstack-swift-6.1.0/manifests/init.pp     2015-08-10 11:13:32.086133292 -0700
[email protected]@ -2,6 +2,10 @@
+--- openstack-swift-6.1.0/manifests/init.pp.orig	2016-04-21 09:04:49.670248833 -0700
++++ openstack-swift-6.1.0/manifests/init.pp	2016-04-21 09:05:19.849256812 -0700
[email protected]@ -1,7 +1,15 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # Install and configure base swift components
  #
  # == Parameters
  #
@@ -15,7 +20,7 @@
  # [*swift_hash_suffix*] string of text to be used
  #   as a salt when hashing to determine mappings in the ring.
  #   This file should be the same on every node in the cluster.
[email protected]@ -29,6 +33,7 @@
[email protected]@ -29,6 +37,7 @@
  # Copyright 2011 Puppetlabs Inc, unless otherwise noted.
  #
  class swift(
@@ -23,10 +28,10 @@
    $swift_hash_suffix,
    $package_ensure        = 'present',
    $client_package_ensure = 'present',
[email protected]@ -49,27 +54,9 @@ class swift(
[email protected]@ -49,27 +58,9 @@
      ensure => $client_package_ensure;
    }
-
+ 
 -  File { owner => 'swift', group => 'swift', require => Package['swift'] }
 -
 -  file { '/etc/swift':
--- a/components/ruby/puppet-modules/openstack-swift/patches/04-proxy.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-swift/patches/04-proxy.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,9 +2,17 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-swift-6.1.0/manifests/proxy.pp.orig	2015-09-14 13:10:38.379095262 +0100
-+++ openstack-swift-6.1.0/manifests/proxy.pp	2015-09-14 13:11:32.939063467 +0100
[email protected]@ -167,17 +167,20 @@
+--- openstack-swift-6.1.0/manifests/proxy.pp.orig	2016-04-21 08:34:39.790662969 -0700
++++ openstack-swift-6.1.0/manifests/proxy.pp	2016-04-21 08:34:51.601941595 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ #
+ # TODO - assumes that proxy server is always a memcached server
+ #
[email protected]@ -167,17 +171,20 @@
      fail ('log_udp_port requires log_udp_host to be set')
    }
  
--- a/components/ruby/puppet-modules/openstack-swift/patches/05-remove-rsync-server.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-swift/patches/05-remove-rsync-server.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,12 +2,20 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-swift-6.1.0/manifests/ringserver.pp.orig 2015-10-15 08:03:54.000000000 -0700
-+++ openstack-swift-6.1.0/manifests/ringserver.pp       2015-11-02 09:49:22.778783205 -0800
[email protected]@ -32,20 +32,9 @@ class swift::ringserver(
-
+--- openstack-swift-6.1.0/manifests/ringserver.pp.orig	2016-04-21 08:35:45.020733168 -0700
++++ openstack-swift-6.1.0/manifests/ringserver.pp	2016-04-21 08:36:15.081896515 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # == Class: swift::ringserver
+ #
+ # Used to create an rsync server to serve up the ring databases via rsync
[email protected]@ -32,20 +36,9 @@
+ 
    Class['swift::ringbuilder'] -> Class['swift::ringserver']
-
+ 
 -  if !defined(Class['rsync::server']) {
 -    class { '::rsync::server':
 -      use_xinetd => true,
@@ -28,13 +36,20 @@
 -    read_only       => true,
 -  }
  }
-
---- openstack-swift-6.1.0/manifests/storage.pp.orig    2015-10-15 08:03:54.000000000 -0700
-+++ openstack-swift-6.1.0/manifests/storage.pp  2015-11-02 09:46:53.798720245 -0800
[email protected]@ -23,11 +23,9 @@ class swift::storage(
+--- openstack-swift-6.1.0/manifests/storage.pp.orig	2016-04-21 08:35:49.421176646 -0700
++++ openstack-swift-6.1.0/manifests/storage.pp	2016-04-21 08:36:21.531668180 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ #
+ # Configures dependencies that are common for all storage
+ # types.
[email protected]@ -23,11 +27,9 @@
    $storage_local_net_ip
  ) {
-
+ 
 -  if !defined(Class['rsync::server']){
 -    class{ '::rsync::server':
 -      use_xinetd => true,
@@ -46,13 +61,20 @@
      }
    }
  }
-
---- openstack-swift-6.1.0/manifests/storage/server.pp.orig       2015-11-02 09:51:04.785489361 -0800
-+++ openstack-swift-6.1.0/manifests/storage/server.pp   2015-11-02 09:51:16.912645480 -0800
[email protected]@ -165,17 +165,6 @@ define swift::storage::server(
-
+--- openstack-swift-6.1.0/manifests/storage/server.pp.orig	2016-04-21 08:35:54.242984740 -0700
++++ openstack-swift-6.1.0/manifests/storage/server.pp	2016-04-21 08:36:24.979535088 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # == Define: swift::storage::server
+ #
+ # Configures an account, container or object server
[email protected]@ -165,17 +169,6 @@
+ 
    $bind_port = $name
-
+ 
 -  rsync::server::module { $type:
 -    path            => $devices,
 -    lock_file       => "/var/lock/${type}.lock",
--- a/components/ruby/puppet-modules/openstack-swift/patches/06-storage.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-swift/patches/06-storage.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,9 +2,17 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-swift-6.1.0/manifests/storage/account.pp.orig	2015-11-01 07:14:14.938361224 -0800
-+++ openstack-swift-6.1.0/manifests/storage/account.pp	2015-11-01 07:14:28.358271152 -0800
[email protected]@ -43,7 +43,6 @@ class swift::storage::account(
+--- openstack-swift-6.1.0/manifests/storage/account.pp.orig	2016-04-21 08:40:58.647841720 -0700
++++ openstack-swift-6.1.0/manifests/storage/account.pp	2016-04-21 08:41:37.781959002 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # Class swift::storage::account
+ #
+ # == Parameters
[email protected]@ -43,7 +47,6 @@
      name     => $::swift::params::account_reaper_service_name,
      enable   => $enabled,
      provider => $::swift::params::service_provider,
@@ -12,16 +20,24 @@
    }
  
    service { 'swift-account-auditor':
[email protected]@ -51,6 +50,5 @@ class swift::storage::account(
[email protected]@ -51,6 +54,5 @@
      name     => $::swift::params::account_auditor_service_name,
      enable   => $enabled,
      provider => $::swift::params::service_provider,
 -    require  => Package['swift-account'],
    }
  }
---- openstack-swift-6.1.0/manifests/storage/container.pp.orig	2015-11-01 07:15:34.539750559 -0800
-+++ openstack-swift-6.1.0/manifests/storage/container.pp	2015-11-01 07:15:55.927391806 -0800
[email protected]@ -48,7 +48,6 @@ class swift::storage::container(
+--- openstack-swift-6.1.0/manifests/storage/container.pp.orig	2016-04-21 08:41:03.411182222 -0700
++++ openstack-swift-6.1.0/manifests/storage/container.pp	2016-04-21 08:41:41.863686954 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ #
+ # === Parameters
+ #
[email protected]@ -48,7 +52,6 @@
      name     => $::swift::params::container_updater_service_name,
      enable   => $enabled,
      provider => $::swift::params::service_provider,
@@ -29,7 +45,7 @@
    }
  
    service { 'swift-container-auditor':
[email protected]@ -56,7 +55,6 @@ class swift::storage::container(
[email protected]@ -56,7 +59,6 @@
      name     => $::swift::params::container_auditor_service_name,
      enable   => $enabled,
      provider => $::swift::params::service_provider,
@@ -37,9 +53,17 @@
    }
  
    if $::operatingsystem == 'Ubuntu' {
---- openstack-swift-6.1.0/manifests/storage/object.pp.orig	2015-11-01 07:16:23.265853901 -0800
-+++ openstack-swift-6.1.0/manifests/storage/object.pp	2015-11-01 07:16:37.685187620 -0800
[email protected]@ -43,7 +43,6 @@ class swift::storage::object(
+--- openstack-swift-6.1.0/manifests/storage/object.pp.orig	2016-04-21 08:41:08.181529232 -0700
++++ openstack-swift-6.1.0/manifests/storage/object.pp	2016-04-21 08:41:44.966394780 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # Class swift::storage::object
+ #
+ # == Parameters
[email protected]@ -43,7 +47,6 @@
      name     => $::swift::params::object_updater_service_name,
      enable   => $enabled,
      provider => $::swift::params::service_provider,
@@ -47,16 +71,24 @@
    }
  
    service { 'swift-object-auditor':
[email protected]@ -51,6 +50,5 @@ class swift::storage::object(
[email protected]@ -51,6 +54,5 @@
      name     => $::swift::params::object_auditor_service_name,
      enable   => $enabled,
      provider => $::swift::params::service_provider,
 -    require  => Package['swift-object'],
    }
  }
---- openstack-swift-6.1.0/manifests/storage/generic.pp.orig	2015-11-01 07:17:15.132929299 -0800
-+++ openstack-swift-6.1.0/manifests/storage/generic.pp	2015-11-01 07:17:33.210237904 -0800
[email protected]@ -42,21 +42,6 @@ define swift::storage::generic(
+--- openstack-swift-6.1.0/manifests/storage/generic.pp.orig	2016-04-21 08:41:14.272088204 -0700
++++ openstack-swift-6.1.0/manifests/storage/generic.pp	2016-04-21 08:41:48.797848159 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # Creates the files packages and services that are
+ # needed to deploy each type of storage server.
+ #
[email protected]@ -42,21 +46,6 @@
  
    validate_re($name, '^object|container|account$')
  
@@ -78,7 +110,7 @@
    if $manage_service {
      if $enabled {
        $service_ensure = 'running'
[email protected]@ -71,7 +56,6 @@ define swift::storage::generic(
[email protected]@ -71,7 +60,6 @@
      enable    => $enabled,
      hasstatus => true,
      provider  => $service_provider,
@@ -86,7 +118,7 @@
    }
  
    service { "swift-${name}-replicator":
[email protected]@ -80,7 +64,6 @@ define swift::storage::generic(
[email protected]@ -80,7 +68,6 @@
      enable    => $enabled,
      hasstatus => true,
      provider  => $service_provider,
--- a/components/ruby/puppet-modules/puppetlabs-apache/patches/01-metadata.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/puppetlabs-apache/patches/01-metadata.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -17,3 +17,12 @@
      }
    ],
    "requirements": [
+
+--- puppetlabs-apache-1.8.1/README.md.orig	2016-04-27 12:17:53.279456960 -0700
++++ puppetlabs-apache-1.8.1/README.md	2016-04-27 12:18:02.195590027 -0700
[email protected]@ -1,3 +1,5 @@
++NOTE: Oracle has modified the originally distributed contents of metadata.json.
++
+ # apache
+ 
+ [Module description]: #module-description
--- a/components/ruby/puppet-modules/puppetlabs-apache/patches/02-params.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/puppetlabs-apache/patches/02-params.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -3,9 +3,17 @@
 
 This patch has not yet been submitted upstream.
 
---- puppetlabs-apache-1.8.1/manifests/params.pp.orig	2016-04-26 09:36:38.662229483 -0700
-+++ puppetlabs-apache-1.8.1/manifests/params.pp	2016-04-26 09:37:47.892342154 -0700
[email protected]@ -183,6 +183,67 @@
+--- puppetlabs-apache-1.8.1/manifests/params.pp.orig	2016-04-27 07:50:46.860433090 -0700
++++ puppetlabs-apache-1.8.1/manifests/params.pp	2016-04-27 07:51:29.164362015 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # Class: apache::params
+ #
+ # This class manages Apache parameters
[email protected]@ -183,6 +187,67 @@
        'base_rules/modsecurity_crs_59_outbound_blocking.conf',
        'base_rules/modsecurity_crs_60_correlation.conf'
      ]
--- a/components/ruby/puppet-modules/puppetlabs-apache/patches/03-version.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/puppetlabs-apache/patches/03-version.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -1,11 +1,19 @@
 Patch to add which version of Apache is supported.  This patch has not
 yet been submitted upstream.
 
---- puppetlabs-apache-1.4.0/manifests/version.pp.orig	2015-06-03 13:37:11.442086477 -0600
-+++ puppetlabs-apache-1.4.0/manifests/version.pp	2015-06-03 13:37:33.305823825 -0600
[email protected]@ -33,6 +33,9 @@ class apache::version {
-     'Gentoo': {
-       $default = '2.4'
+--- puppetlabs-apache-1.8.1/manifests/version.pp.orig	2016-02-09 08:50:27.000000000 -0800
++++ puppetlabs-apache-1.8.1/manifests/version.pp	2016-04-20 12:56:54.113346691 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # Class: apache::version
+ #
+ # Try to automatically detect the version by OS
[email protected]@ -38,6 +42,9 @@
+     'Suse': {
+       $default = '2.2'
      }
 +    'Solaris': {
 +      $default = '2.4'
--- a/components/ruby/puppet-modules/puppetlabs-apache/patches/04-init.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/puppetlabs-apache/patches/04-init.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -1,9 +1,17 @@
 Patch to add Solaris specific elements to the main Apache
 configuration file.  This patch has not yet been submitted upstream.
 
---- puppetlabs-apache-1.8.1/manifests/init.pp.orig	2016-02-09 08:53:22.000000000 -0800
-+++ puppetlabs-apache-1.8.1/manifests/init.pp	2016-04-26 09:36:14.315166408 -0700
[email protected]@ -305,6 +305,11 @@
+--- puppetlabs-apache-1.8.1/manifests/init.pp.orig	2016-04-27 07:52:17.681437269 -0700
++++ puppetlabs-apache-1.8.1/manifests/init.pp	2016-04-27 07:52:49.540772562 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # Class: apache
+ #
+ # This class installs Apache
[email protected]@ -305,6 +309,11 @@
          $scriptalias          = '/usr/lib/cgi-bin'
          $access_log_file      = 'access.log'
        }
--- a/components/ruby/puppet-modules/puppetlabs-apache/patches/06-mod-prefork.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/puppetlabs-apache/patches/06-mod-prefork.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -1,9 +1,17 @@
 Patch to add Solaris to the list of OSes which use the 'prefork'
 version of mod-prefork.  This patch has not yet been submitted upstream.
 
---- puppetlabs-apache-1.4.0/manifests/mod/prefork.pp.orig	2015-06-03 13:52:13.784864270 -0600
-+++ puppetlabs-apache-1.4.0/manifests/mod/prefork.pp	2015-06-03 13:54:14.441044752 -0600
[email protected]@ -60,7 +60,7 @@ class apache::mod::prefork (
+--- puppetlabs-apache-1.8.1/manifests/mod/prefork.pp.orig	2016-04-20 12:59:10.851657068 -0700
++++ puppetlabs-apache-1.8.1/manifests/mod/prefork.pp	2016-04-20 12:59:35.452404762 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ class apache::mod::prefork (
+   $startservers        = '8',
+   $minspareservers     = '5',
[email protected]@ -60,7 +64,7 @@
          }
        }
      }
--- a/components/ruby/puppet-modules/puppetlabs-apache/patches/07-mpm.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/puppetlabs-apache/patches/07-mpm.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -1,14 +1,22 @@
 Patch to add Solaris to the list of OSes which do not deliver mod-mpm.
 This patch has not yet been submitted upstream.
 
---- puppetlabs-apache-1.4.0/manifests/mpm.pp.orig	2015-06-03 13:55:24.304854831 -0600
-+++ puppetlabs-apache-1.4.0/manifests/mpm.pp	2015-06-03 13:55:33.301896584 -0600
[email protected]@ -65,7 +65,7 @@ define apache::mpm (
-         mpm_module => $mpm
-       }
+--- puppetlabs-apache-1.8.1/manifests/mpm.pp.orig	2016-02-09 08:50:27.000000000 -0800
++++ puppetlabs-apache-1.8.1/manifests/mpm.pp	2016-04-20 13:01:03.658052589 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ define apache::mpm (
+   $lib_path       = $::apache::lib_path,
+   $apache_version = $::apache::apache_version,
[email protected]@ -85,7 +89,7 @@
+     'gentoo': {
+       # so we don't fail
      }
 -    'redhat': {
 +    'redhat', 'solaris': {
        # so we don't fail
      }
-     default: {
+     'Suse': {
--- a/components/ruby/puppet-modules/puppetlabs-apache/patches/08-default-mods.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/puppetlabs-apache/patches/08-default-mods.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -1,11 +1,19 @@
 Patch to add a list of default Apache mods for Solaris.  This patch
 has not yet been submitted upstream.
 
---- puppetlabs-apache-1.4.0/manifests/default_mods.pp.orig	2015-06-08 14:01:18.373054664 -0600
-+++ puppetlabs-apache-1.4.0/manifests/default_mods.pp	2015-06-08 14:01:47.911393573 -0600
[email protected]@ -22,6 +22,10 @@ class apache::default_mods (
+--- puppetlabs-apache-1.8.1/manifests/default_mods.pp.orig	2016-02-09 08:50:27.000000000 -0800
++++ puppetlabs-apache-1.8.1/manifests/default_mods.pp	2016-04-20 13:02:24.204613923 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ class apache::default_mods (
+   $all            = true,
+   $mods           = undef,
[email protected]@ -28,6 +32,10 @@
+     'Suse': {
        ::apache::mod { 'log_config': }
-       ::apache::mod { 'unixd': }
      }
 +    'solaris': {
 +      ::apache::mod { 'log_config': }
--- a/components/ruby/puppet-modules/puppetlabs-apache/patches/09-mod-ssl.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/puppetlabs-apache/patches/09-mod-ssl.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -1,9 +1,17 @@
 Patch to add Solaris specific paths for mod-ssl.  This patch has not
 yet been submitted upstream.
 
---- puppetlabs-apache-1.8.1/manifests/mod/ssl.pp.orig	2016-04-25 12:42:50.344060420 -0700
-+++ puppetlabs-apache-1.8.1/manifests/mod/ssl.pp	2016-04-25 12:48:12.151380956 -0700
[email protected]@ -32,6 +32,15 @@
+--- puppetlabs-apache-1.8.1/manifests/mod/ssl.pp.orig	2016-04-27 07:53:23.937888941 -0700
++++ puppetlabs-apache-1.8.1/manifests/mod/ssl.pp	2016-04-27 07:54:00.569656120 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ class apache::mod::ssl (
+   $ssl_compression         = false,
+   $ssl_cryptodevice        = 'builtin',
[email protected]@ -32,6 +36,15 @@
      'gentoo': {
        $ssl_mutex = 'default'
      }
@@ -19,7 +27,7 @@
      'Suse': {
        $ssl_mutex = 'default'
      }
[email protected]@ -40,12 +49,31 @@
[email protected]@ -40,12 +53,31 @@
      }
    }
  
--- a/components/ruby/puppet-modules/puppetlabs-concat/patches/01-metadata.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/puppetlabs-concat/patches/01-metadata.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -13,3 +13,12 @@
        ]
      },
      {
+
+--- puppetlabs-concat-1.2.1/README.md.orig	2016-04-27 12:19:50.915854061 -0700
++++ puppetlabs-concat-1.2.1/README.md	2016-04-27 12:19:05.918751816 -0700
[email protected]@ -1,3 +1,5 @@
++NOTE: Oracle has modified the originally distributed contents of metadata.json.
++
+ #concat
+ 
+ ####Table of Contents
--- a/components/ruby/puppet-modules/puppetlabs-mysql/patches/01-installdb.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/puppetlabs-mysql/patches/01-installdb.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -1,9 +1,17 @@
 In-house patch to change the path for Solaris to find install_db.
 This patch is not suitable for upstream.
 
---- puppetlabs-mysql-3.6.0/manifests/server/installdb.pp.orig	2015-08-04 09:50:53.470952177 -0700
-+++ puppetlabs-mysql-3.6.0/manifests/server/installdb.pp	2015-08-04 09:51:21.619646340 -0700
[email protected]@ -18,7 +18,7 @@ class mysql::server::installdb {
+--- puppetlabs-mysql-3.6.2/manifests/server/installdb.pp.orig	2016-04-20 13:29:42.665456334 -0700
++++ puppetlabs-mysql-3.6.2/manifests/server/installdb.pp	2016-04-20 13:30:14.639675624 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ #
+ class mysql::server::installdb {
+ 
[email protected]@ -18,7 +22,7 @@
        command   => "mysql_install_db ${install_db_args}",
        creates   => "${datadir}/mysql",
        logoutput => on_failure,
--- a/components/ruby/puppet-modules/puppetlabs-mysql/patches/02-params.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/puppetlabs-mysql/patches/02-params.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -1,9 +1,17 @@
 Patch to correctly set the MySQL basedir parameter.  This bug has not
 yet been submitted upstream.
 
---- puppetlabs-mysql-3.6.1/manifests/params.pp.orig	2016-03-15 13:23:06.912144548 -0700
-+++ puppetlabs-mysql-3.6.1/manifests/params.pp	2016-03-15 13:23:26.903095763 -0700
[email protected]@ -288,7 +288,7 @@ class mysql::params {
+--- puppetlabs-mysql-3.6.2/manifests/params.pp.orig	2016-04-20 13:31:03.825840809 -0700
++++ puppetlabs-mysql-3.6.2/manifests/params.pp	2016-04-20 13:31:46.763615238 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # Private class: See README.md.
+ class mysql::params {
+ 
[email protected]@ -288,7 +292,7 @@
      'Solaris': {
        $client_package_name = 'database/mysql-55/client'
        $server_package_name = 'database/mysql-55'
--- a/components/ruby/puppet-modules/puppetlabs-ntp/patches/01-metadata.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/puppetlabs-ntp/patches/01-metadata.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -11,3 +11,12 @@
 -  "description": "NTP Module for Debian, Ubuntu, CentOS, RHEL, OEL, Fedora, FreeBSD, ArchLinux and Gentoo."
 +  "description": "NTP Module for Debian, Ubuntu, CentOS, RHEL, OEL, Fedora, FreeBSD, ArchLinux, Gentoo, and Solaris."
  }
+
+--- puppetlabs-ntp-4.1.2/README.markdown.orig	2016-04-27 12:20:39.525212739 -0700
++++ puppetlabs-ntp-4.1.2/README.markdown	2016-04-27 12:20:47.926315738 -0700
[email protected]@ -1,3 +1,5 @@
++NOTE: Oracle has modified the originally distributed contents of metadata.json.
++
+ #ntp
+ 
+ ####Table of Contents
--- a/components/ruby/puppet-modules/puppetlabs-rabbitmq/patches/01-metadata.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/puppetlabs-rabbitmq/patches/01-metadata.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -19,3 +19,12 @@
      }
    ],
    "requirements": [
+
+--- puppetlabs-rabbitmq-5.3.1/README.md.orig	2016-04-27 12:21:31.400855064 -0700
++++ puppetlabs-rabbitmq-5.3.1/README.md	2016-04-27 12:21:39.844234736 -0700
[email protected]@ -1,3 +1,5 @@
++NOTE: Oracle has modified the originally distributed contents of metadata.json.
++
+ #rabbitmq
+ 
+ ####Table of Contents
--- a/components/ruby/puppet-modules/puppetlabs-rabbitmq/patches/02-params.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/puppetlabs-rabbitmq/patches/02-params.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -1,9 +1,17 @@
 Patch to add Solaris support.  This patch has not yet been submitted
 upstream.
 
---- puppetlabs-rabbitmq-5.3.1/manifests/params.pp.orig       2015-11-17 09:56:06.990672489 -0800
-+++ puppetlabs-rabbitmq-5.3.1/manifests/params.pp   2015-11-17 09:58:13.170609766 -0800
[email protected]@ -58,6 +58,17 @@ class rabbitmq::params {
+--- puppetlabs-rabbitmq-5.3.1/manifests/params.pp.orig	2016-04-20 13:36:29.896159874 -0700
++++ puppetlabs-rabbitmq-5.3.1/manifests/params.pp	2016-04-20 13:41:31.538412172 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+   # Class: rabbitmq::params
+ #
+ #   The RabbitMQ Module configuration settings.
[email protected]@ -58,6 +62,17 @@
        $rabbitmq_home    = '/var/lib/rabbitmq'
        $plugin_dir       = "/usr/lib/rabbitmq/lib/rabbitmq_server-${version}/plugins"
      }
--- a/components/ruby/puppet-modules/puppetlabs-rabbitmq/patches/03-rabbitmqadmin.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/puppetlabs-rabbitmq/patches/03-rabbitmqadmin.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -1,11 +1,19 @@
 In house patch for setting rabbitmqadmin to sensible Solaris defaults
 
---- puppetlabs-rabbitmq-5.3.1/manifests/install/rabbitmqadmin.pp.orig  2015-11-17 09:54:04.669956465 -0800
-+++ puppetlabs-rabbitmq-5.3.1/manifests/install/rabbitmqadmin.pp    2015-11-17 09:55:02.467787905 -0800
[email protected]@ -25,9 +25,9 @@ class rabbitmq::install::rabbitmqadmin {
+--- puppetlabs-rabbitmq-5.3.1/manifests/install/rabbitmqadmin.pp.orig	2016-04-20 13:43:23.249577168 -0700
++++ puppetlabs-rabbitmq-5.3.1/manifests/install/rabbitmqadmin.pp	2016-04-20 13:43:48.146226093 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ #
+ class rabbitmq::install::rabbitmqadmin {
+ 
[email protected]@ -25,9 +29,9 @@
      ],
    }
-
+ 
 -  file { '/usr/local/bin/rabbitmqadmin':
 +  file { '/usr/bin/rabbitmqadmin':
      owner   => 'root',
--- a/components/ruby/puppet-modules/puppetlabs-rabbitmq/patches/04-erlang_cookie_ownership.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/puppetlabs-rabbitmq/patches/04-erlang_cookie_ownership.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,9 +2,17 @@
 proper ownership before starting rabbitmq.  This patch is not suitable
 for upstream.
 
---- ORIG/manifests/init.pp	2016-01-22 18:14:21.976458350 +0000
-+++ puppetlabs-rabbitmq-5.3.1/manifests/init.pp	2016-01-22 18:14:59.495828828 +0000
[email protected]@ -233,7 +233,13 @@
+--- puppetlabs-rabbitmq-5.3.1/manifests/init.pp.orig	2016-04-21 06:25:00.840836012 -0700
++++ puppetlabs-rabbitmq-5.3.1/manifests/init.pp	2016-04-21 06:25:36.238696524 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # Main rabbitmq class
+ class rabbitmq(
+   $admin_enable               = $rabbitmq::params::admin_enable,
[email protected]@ -233,7 +237,13 @@
    anchor { 'rabbitmq::begin': }
    anchor { 'rabbitmq::end': }
  
--- a/components/ruby/puppet-modules/puppetlabs-rabbitmq/patches/05-rabbitmqadmin-usr-local.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/puppetlabs-rabbitmq/patches/05-rabbitmqadmin-usr-local.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -1,10 +1,17 @@
 In-house patch to have the rabbitmq providers look in /usr/bin for
 rabbitmqadmin instead of /usr/local/bin
 
---- puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_binding/rabbitmqadmin.rb.orig  2015-11-20 07:01:01.498398940 -0800
-+++ puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_binding/rabbitmqadmin.rb    2015-11-20 07:01:14.230495648 -0800
[email protected]@ -4,12 +4,12 @@ Puppet::Type.type(:rabbitmq_binding).pro
-
+--- puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_binding/rabbitmqadmin.rb.orig	2016-04-21 06:32:55.385984680 -0700
++++ puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_binding/rabbitmqadmin.rb	2016-04-21 06:37:14.452024943 -0700
[email protected]@ -1,15 +1,19 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ require 'json'
+ require 'puppet'
+ Puppet::Type.type(:rabbitmq_binding).provide(:rabbitmqadmin) do
+ 
    if Puppet::PUPPETVERSION.to_f < 3
      commands :rabbitmqctl   => 'rabbitmqctl'
 -    commands :rabbitmqadmin => '/usr/local/bin/rabbitmqadmin'
@@ -19,10 +26,17 @@
      end
    end
 
---- puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb.orig  2015-11-20 07:29:19.574821579 -0800
-+++ puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb    2015-11-20 07:29:25.845150783 -0800
[email protected]@ -4,12 +4,12 @@ Puppet::Type.type(:rabbitmq_exchange).pr
-
+--- puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb.orig	2016-04-21 06:33:00.401594316 -0700
++++ puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb	2016-04-21 06:37:20.410206326 -0700
[email protected]@ -1,15 +1,19 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ require 'puppet'
+ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'rabbitmqctl'))
+ Puppet::Type.type(:rabbitmq_exchange).provide(:rabbitmqadmin, :parent => Puppet::Provider::Rabbitmqctl) do
+ 
    if Puppet::PUPPETVERSION.to_f < 3
      commands :rabbitmqctl   => 'rabbitmqctl'
 -    commands :rabbitmqadmin => '/usr/local/bin/rabbitmqadmin'
@@ -37,10 +51,17 @@
      end
    end
 
---- puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_queue/rabbitmqadmin.rb.orig  2015-11-20 07:30:21.622578483 -0800
-+++ puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_queue/rabbitmqadmin.rb    2015-11-20 07:30:26.940673078 -0800
[email protected]@ -4,12 +4,12 @@ Puppet::Type.type(:rabbitmq_queue).provi
-
+--- puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_queue/rabbitmqadmin.rb.orig	2016-04-21 06:33:06.190244636 -0700
++++ puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_queue/rabbitmqadmin.rb	2016-04-21 06:37:27.198708092 -0700
[email protected]@ -1,15 +1,19 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ require 'json'
+ require 'puppet'
+ Puppet::Type.type(:rabbitmq_queue).provide(:rabbitmqadmin) do
+ 
    if Puppet::PUPPETVERSION.to_f < 3
      commands :rabbitmqctl   => 'rabbitmqctl'
 -    commands :rabbitmqadmin => '/usr/local/bin/rabbitmqadmin'
--- a/components/ruby/puppet-modules/puppetlabs-rsync/patches/01-metadata.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/puppetlabs-rsync/patches/01-metadata.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -12,3 +12,12 @@
      {"name":"puppetlabs/concat","version_requirement":">= 1.1.1"}
    ]
  }
+
+--- puppetlabs-rsync-0.4.0/README.markdown.orig	2016-04-27 12:22:19.982946853 -0700
++++ puppetlabs-rsync-0.4.0/README.markdown	2016-04-27 12:22:29.277763740 -0700
[email protected]@ -1,3 +1,5 @@
++NOTE: Oracle has modified the originally distributed contents of metadata.json.
++
+ # puppetlabs-rsync #
+ 
+ puppetlabs-rsync manages rsync clients, repositories, and servers as well as
--- a/components/ruby/puppet-modules/saz-memcached/patches/01-metadata.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/saz-memcached/patches/01-metadata.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -25,3 +25,12 @@
 +    {"name":"puppetlabs/stdlib","version_requirement":">= 3.2.0"}
    ]
  }
+
+--- saz-memcached-2.8.1/README.md.orig	2016-04-27 12:23:14.628880726 -0700
++++ saz-memcached-2.8.1/README.md	2016-04-27 12:23:27.017435303 -0700
[email protected]@ -1,3 +1,5 @@
++NOTE: Oracle has modified the originally distributed contents of metadata.json.
++
+ # puppet-memcached [![Build Status](https://secure.travis-ci.org/saz/puppet-memcached.png)](http://travis-ci.org/saz/puppet-memcached)
+ 
+ Manage memcached via Puppet
--- a/components/ruby/puppet-modules/saz-memcached/patches/02-params.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/saz-memcached/patches/02-params.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -1,9 +1,17 @@
 Patch to add Solaris support.  This patch has not yet been submitted
 upstream.
 
---- saz-memcached-2.7.1/manifests/params.pp.orig	2015-04-23 15:28:05.970302743 -0600
-+++ saz-memcached-2.7.1/manifests/params.pp	2015-04-23 15:32:28.863884307 -0600
[email protected]@ -38,6 +38,18 @@ class memcached::params {
+--- saz-memcached-2.8.1/manifests/params.pp.orig	2016-04-21 07:37:25.001380092 -0700
++++ saz-memcached-2.8.1/manifests/params.pp	2016-04-21 07:37:54.723279127 -0700
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ # == Class: memcached::params
+ #
+ class memcached::params {
[email protected]@ -38,6 +42,18 @@
        $logfile           = undef
        $use_registry      = true
      }
--- a/components/ruby/puppet/patches/puppet-00-s12pkg.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet/patches/puppet-00-s12pkg.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -1,9 +1,17 @@
 Oracle customization - non upstream patch
 Add Solaris 12 to the pkg(5) pkg provider
 
---- puppet-3.6.2/lib/puppet/provider/package/pkg.rb.orig	2012-10-19 22:57:51.000000000 -0600
-+++ puppet-3.6.2/lib/puppet/provider/package/pkg.rb	2012-10-24 15:55:23.203830708 -0600
[email protected]@ -23,7 +23,7 @@
+--- 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
[email protected]@ -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
[email protected]@ -23,7 +27,7 @@
  
    confine :osfamily => :solaris
  
@@ -12,3 +20,4 @@
  
    def self.instances
      pkg(:list, '-H').split("\n").map{|l| new(parse_line(l))}
+
--- a/components/ruby/puppet/patches/puppet-01-installrb-nogzip-manpage.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet/patches/puppet-01-installrb-nogzip-manpage.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,9 +2,17 @@
 Prevent puppet's build script from gzipping the manpages.  Our version
 of man doesn't understand manpages with a .gz extension
 
---- puppet-3.6.2/install.rb.orig	2014-06-18 09:37:25.655213788 -0600
-+++ puppet-3.6.2/install.rb	2014-06-18 09:34:22.299805367 -0600
[email protected]@ -135,9 +135,6 @@
+--- 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
[email protected]@ -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
[email protected]@ -135,9 +138,6 @@
        FileUtils.chmod(0755, om)
        FileUtils.install(mf, omf, {:mode => 0644, :preserve => true, :verbose => true})
      end
@@ -13,4 +21,4 @@
 -    %x{#{gzip} -f #{omf}}
    end
  end
- 
+
--- a/components/ruby/puppet/patches/puppet-02-zone-type.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet/patches/puppet-02-zone-type.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -1,21 +1,25 @@
 Enhance the zone type to configure zones using a zonecfg export file format.
 Enhance the output of the puppet resource zone.
 
---- puppet-3.8.3/lib/puppet/type/zone.rb.orig	2015-09-21 14:46:28.000000000 -0700
-+++ puppet-3.8.3/lib/puppet/type/zone.rb	2015-11-25 15:06:43.877815091 -0800
[email protected]@ -1,10 +1,5 @@
+--- 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
[email protected]@ -1,10 +1,9 @@
 -require 'puppet/property/list'
- Puppet::Type.newtype(:zone) do
+-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
[email protected]@ -59,7 +54,7 @@
[email protected]@ -59,7 +58,7 @@
  
      def self.fsm
        return @fsm if @fsm
@@ -24,7 +28,7 @@
      end
  
      def self.alias_state(values)
[email protected]@ -75,7 +70,7 @@
[email protected]@ -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
@@ -33,7 +37,7 @@
      seqvalue :configured, :up => :configure, :down => :uninstall
      seqvalue :installed, :up => :install, :down => :stop
      seqvalue :running, :up => :start
[email protected]@ -104,10 +99,10 @@
[email protected]@ -104,10 +103,10 @@
          sleep 1
        end
        provider.send(method)
@@ -45,7 +49,7 @@
        method = nil
        direction = up? ? :up : :down
  
[email protected]@ -131,132 +126,34 @@
[email protected]@ -131,132 +130,34 @@
  
    newparam(:name) do
      desc "The name of the zone."
@@ -105,12 +109,8 @@
 -    desc "Whether the zone should automatically boot."
 -    defaultto true
 -    newvalues(:true, :false)
-+  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
- 
+-  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
@@ -128,8 +128,12 @@
 -        value
 -      end
 -    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
@@ -196,7 +200,7 @@
    end
  
    # Specify the sysidcfg file.  This is pretty hackish, because it's
[email protected]@ -293,70 +190,11 @@
[email protected]@ -293,70 +194,11 @@
        so Puppet only checks for it at that time.}
    end
  
@@ -267,7 +271,7 @@
      hash = provider.properties
      return setstatus(hash) unless hash.nil? or hash[:ensure] == :absent
      # Return all properties as absent.
[email protected]@ -379,4 +217,25 @@
[email protected]@ -379,4 +221,25 @@
      end
      prophash
    end
--- a/components/ruby/puppet/patches/puppet-03-zone-provider.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet/patches/puppet-03-zone-provider.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -1,16 +1,20 @@
 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.3/lib/puppet/provider/zone/solaris.rb.orig	2015-09-21 14:46:28.000000000 -0700
-+++ puppet-3.8.3/lib/puppet/provider/zone/solaris.rb	2015-11-25 15:17:51.503592308 -0800
[email protected]@ -1,5 +1,5 @@
+--- 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
[email protected]@ -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
[email protected]@ -8,129 +8,84 @@
[email protected]@ -8,129 +12,84 @@
  
    # Convert the output of a list into a hash
    def self.line2hash(line)
@@ -153,7 +157,7 @@
 +      end
      end
 -  end
--
+ 
 -  def my_properties
 -    [:path, :iptype, :autoboot, :pool, :shares, :ip, :dataset, :inherit]
 -  end
@@ -162,7 +166,7 @@
 -  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|
@@ -187,7 +191,7 @@
    def exists?
      properties[:ensure] != :absent
    end
[email protected]@ -138,31 +93,35 @@
[email protected]@ -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)
@@ -243,7 +247,7 @@
        zoneadm :install, @resource[:install_args].split(" ")
      else
        zoneadm :install
[email protected]@ -182,11 +141,12 @@
[email protected]@ -182,11 +145,12 @@
        end
      end
      @property_hash.dup
@@ -257,7 +261,7 @@
      hash = status
      return false unless hash
      ["incomplete", "ready", "shutting_down"].include? hash[:ensure]
[email protected]@ -214,7 +174,6 @@
[email protected]@ -214,7 +178,6 @@
    #
    def getconfig
      output = zonecfg :info
@@ -265,7 +269,7 @@
      name = nil
      current = nil
      hash = {}
[email protected]@ -244,14 +203,9 @@
[email protected]@ -244,14 +207,9 @@
      hash
    end
  
@@ -281,7 +285,7 @@
      if cfg = @resource[:sysidcfg]
        self.fail "Path is required" unless @resource[:path]
        zoneetc = File.join(@resource[:path], "root", "etc")
[email protected]@ -272,7 +226,9 @@
[email protected]@ -272,7 +230,9 @@
          end
        end
      end
@@ -291,7 +295,7 @@
      zoneadm :boot
    end
  
[email protected]@ -285,64 +241,35 @@
[email protected]@ -285,64 +245,35 @@
      end
  
      main = self.class.line2hash(output.chomp)
--- a/components/ruby/puppet/patches/puppet-04-agent-auditing.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet/patches/puppet-04-agent-auditing.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -1,8 +1,12 @@
 Add auditing support to agent execution
 
---- puppet-3.6.2/lib/puppet/agent.rb.orig	2014-06-18 09:30:30.571283131 -0600
-+++ puppet-3.6.2/lib/puppet/agent.rb	2014-06-16 10:47:24.851029500 -0600
[email protected]@ -1,4 +1,7 @@
+--- 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
[email protected]@ -1,4 +1,11 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
  require 'puppet/application'
 +if Facter.value(:osfamily) == "Solaris"
 +  require 'PuppetAudit'
@@ -10,7 +14,7 @@
  
  # A general class for triggering a run of another
  # class.
[email protected]@ -37,6 +40,11 @@
[email protected]@ -37,6 +44,11 @@
        return
      end
  
@@ -22,7 +26,7 @@
      result = nil
      block_run = Puppet::Application.controlled_run do
        splay client_options.fetch :splay, Puppet[:splay]
[email protected]@ -52,6 +60,10 @@
[email protected]@ -52,6 +64,10 @@
            end
          end
        end
--- a/components/ruby/puppet/patches/puppet-06-provider-smf.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet/patches/puppet-06-provider-smf.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -1,7 +1,16 @@
 Add check for existence of smf service
---- puppet-3.6.2/lib/puppet/provider/service/smf.rb.orig	2013-07-15 09:23:24.667341073 -0600
-+++ puppet-3.6.2/lib/puppet/provider/service/smf.rb	2013-07-15 10:13:03.196178924 -0600
[email protected]@ -80,9 +80,18 @@
+
+--- 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
[email protected]@ -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
[email protected]@ -80,9 +84,18 @@
        return
      end
  
--- a/components/ruby/puppet/patches/puppet-07-PUP-2641.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet/patches/puppet-07-PUP-2641.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,9 +2,17 @@
 https://tickets.puppetlabs.com/browse/PUP-2641
 Patch has been submitted upstream but not yet accepted.
 
---- puppet-3.6.2/lib/puppet/application/describe.rb.orig	2014-05-29 08:14:12.779421080 -0600
-+++ puppet-3.6.2/lib/puppet/application/describe.rb	2014-05-29 08:14:37.064254740 -0600
[email protected]@ -70,13 +70,8 @@
+--- 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
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ require 'puppet/application'
+ 
+ class Formatter
[email protected]@ -70,13 +74,8 @@
      }.each do |name|
        type = @types[name]
        s = type.doc.gsub(/\s+/, " ")
--- a/components/ruby/puppet/patches/puppet-08-PUP-2509.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet/patches/puppet-08-PUP-2509.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -2,9 +2,9 @@
 https://tickets.puppetlabs.com/browse/PUP-2509
 Patch has been submitted upstream but not yet accepted.
 
---- puppet-3.6.2/lib/puppet/provider/service/smf.rb.orig	2014-05-29 08:23:38.214504274 -0600
-+++ puppet-3.6.2/lib/puppet/provider/service/smf.rb	2014-05-29 08:23:51.968114765 -0600
[email protected]@ -32,7 +32,7 @@
+--- 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
[email protected]@ -36,7 +36,7 @@
    end
  
    def self.instances
--- a/components/ruby/puppet/patches/puppet-09-role-shell.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet/patches/puppet-09-role-shell.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -1,6 +1,14 @@
---- puppet-3.8.3/lib/puppet/provider/user/user_role_add.rb.orig	2015-09-21 14:46:28.000000000 -0700
-+++ puppet-3.8.3/lib/puppet/provider/user/user_role_add.rb	2015-12-03 09:41:52.593175175 -0800
[email protected]@ -12,6 +12,7 @@
+--- 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
[email protected]@ -1,3 +1,7 @@
++#######################################################################
++# Oracle has modified the originally distributed contents of this file.
++#######################################################################
++
+ require 'puppet/util'
+ require 'puppet/util/user_attr'
+ require 'date'
[email protected]@ -12,6 +16,7 @@
    options :home, :flag => "-d", :method => :dir
    options :comment, :method => :gecos
    options :groups, :flag => "-G"
@@ -8,7 +16,7 @@
    options :roles, :flag => "-R"
    options :auths, :flag => "-A"
    options :profiles, :flag => "-P"
[email protected]@ -26,7 +27,22 @@
[email protected]@ -26,7 +31,22 @@
      value !~ /\s/
    end
  
--- a/components/ruby/puppet/patches/puppet-10-smf-recursive-enable.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet/patches/puppet-10-smf-recursive-enable.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -1,9 +1,9 @@
 Patch to make svcadm enable default to using the -r flag.  This patch
 has not yet been submitted upstream.
 
---- puppet-3.6.2/lib/puppet/provider/service/smf.rb.orig        2015-06-02 10:28:10.870219833 -0600
-+++ puppet-3.6.2/lib/puppet/provider/service/smf.rb      2015-06-02 10:28:19.325013006 -0600
[email protected]@ -70,7 +70,7 @@ Puppet::Type.type(:service).provide :smf
+--- 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
[email protected]@ -74,7 +74,7 @@
      when :maintenance
        [command(:adm), :clear, @resource[:name]]
      else
--- a/components/ruby/puppet/patches/puppet-11-smf-degraded.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet/patches/puppet-11-smf-degraded.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -1,12 +1,11 @@
 Add support for degraded state in smf and remove unused variable stime.
 Submitted upstream as PUP-6095
 
-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
[email protected]@ -32,11 +32,12 @@
+--- 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
[email protected]@ -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+/)
@@ -19,7 +18,7 @@
                 else :stopped
                 end
       new({:name => fmri, :ensure => status})
[email protected]@ -67,7 +68,7 @@
[email protected]@ -71,7 +72,7 @@
    def startcmd
      self.setupservice
      case self.status
@@ -28,7 +27,7 @@
        [command(:adm), :clear, @resource[:name]]
      else
        [command(:adm), :enable, "-rs", @resource[:name]]
[email protected]@ -108,6 +109,8 @@
[email protected]@ -112,6 +113,8 @@
        return :stopped
      when "maintenance"
        return :maintenance
--- a/components/ruby/puppet/patches/puppet-12-pkg-provider-latest.patch	Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet/patches/puppet-12-pkg-provider-latest.patch	Wed Apr 27 14:55:10 2016 -0700
@@ -5,10 +5,9 @@
 Wildcards support
 install_options/uninstall_options features support
 
---- puppet-3.8.6/lib/puppet/provider/package/pkg.orig	2016-04-13 14:39:48.421008932 -0700
-+++ puppet-3.8.6/lib/puppet/provider/package/pkg.rb	2016-04-13 14:27:31.382336591 -0700
[email protected]@ -1,7 +1,8 @@
-+require 'json'
+--- 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
[email protected]@ -5,7 +5,7 @@
  require 'puppet/provider/package'
  
  Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package do
@@ -17,7 +16,7 @@
    # http://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.)
[email protected]@ -14,10 +15,10 @@
[email protected]@ -18,10 +18,10 @@
    # TODO: We still have to allow packages to specify a preferred publisher.
  
    has_feature :versionable
@@ -30,7 +29,7 @@
  
    commands :pkg => "/usr/bin/pkg"
  
[email protected]@ -26,7 +27,7 @@
[email protected]@ -30,7 +30,7 @@
    defaultfor :osfamily => :solaris, :kernelrelease => ['5.11', '5.12']
  
    def self.instances
@@ -39,7 +38,7 @@
    end
  
    # The IFO flag field is just what it names, the first field can have ether
[email protected]@ -69,6 +70,10 @@
[email protected]@ -73,6 +73,10 @@
      {}
    end
  
@@ -50,7 +49,7 @@
    # 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)
[email protected]@ -90,29 +95,73 @@
[email protected]@ -94,29 +98,73 @@
    # formats of output for different pkg versions.
    def self.parse_line(line)
      (case line.chomp
@@ -142,7 +141,7 @@
    def hold
      pkg(:freeze, @resource[:name])
    end
[email protected]@ -122,31 +171,22 @@
[email protected]@ -126,31 +174,22 @@
      raise Puppet::Error, "Unable to unfreeze #{r[:out]}" unless [0,4].include? r[:exit]
    end
  
@@ -189,7 +188,7 @@
    end
  
    # install the package and accept all licenses.
[email protected]@ -162,19 +202,22 @@
[email protected]@ -166,19 +205,22 @@
          self.uninstall if Puppet::Util::Package.versioncmp(should, is[:ensure]) < 0
        end
      end
@@ -215,7 +214,7 @@
      cmd << @resource[:name]
      pkg cmd
    end
[email protected]@ -187,10 +230,22 @@
[email protected]@ -191,10 +233,22 @@
      raise Puppet::Error, "Unable to update #{r[:out]}"
    end