components/ruby/puppet-modules/openstack-keystone/patches/02-params.patch
changeset 5860 afd31ba91ee9
parent 5464 6e2e17e6aa45
child 6817 e4a26f447d0c
--- 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
-@@ -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
+@@ -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'
-@@ -26,6 +26,7 @@ class keystone::params {
+@@ -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'
-@@ -34,5 +35,14 @@ class keystone::params {
+@@ -34,5 +39,14 @@
        $keystone_wsgi_script_source  = '/usr/share/keystone/keystone.wsgi'
        $paste_config                 = '/usr/share/keystone/keystone-dist-paste.ini'
      }