diff -r bb11bcf4ebf8 -r e4a26f447d0c components/ruby/puppet-modules/openstack-keystone/patches/03-init.patch
--- a/components/ruby/puppet-modules/openstack-keystone/patches/03-init.patch	Wed Sep 07 14:48:35 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-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/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
-@@ -1,3 +1,7 @@
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
-+
- #
- # Module for managing keystone config.
- #
-@@ -544,18 +548,12 @@
- 
-   file { ['/etc/keystone', '/var/log/keystone', '/var/lib/keystone']:
-     ensure  => directory,
--    mode    => '0750',
--    owner   => 'keystone',
--    group   => 'keystone',
-     require => Package['keystone'],
-     notify  => Service[$service_name],
-   }
- 
-   file { '/etc/keystone/keystone.conf':
-     ensure  => present,
--    mode    => '0600',
--    owner   => 'keystone',
--    group   => 'keystone',
-     require => Package['keystone'],
-     notify  => Service[$service_name],
-   }