components/ruby/puppet-modules/openstack-keystone/patches/04-client.patch
author Patrick Einheber <patrick.einheber@oracle.com>
Wed, 27 Apr 2016 14:55:10 -0700
changeset 5860 afd31ba91ee9
parent 5464 6e2e17e6aa45
child 6817 e4a26f447d0c
permissions -rw-r--r--
23146903 Puppet and OpenStack modules need modification notices

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/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
@@ -1,3 +1,7 @@
+#######################################################################
+# Oracle has modified the originally distributed contents of this file.
+#######################################################################
+
 # == Class: keystone::client
 #
 # Installs Keystone client.
@@ -12,8 +16,15 @@
   $ensure = 'present'
 ) {
 
-  package { 'python-keystoneclient':
-    ensure => $ensure,
-    tag    => 'openstack',
+  if $::osfamily == 'Solaris' {
+    package { 'library/python/keystoneclient':
+      ensure => $ensure,
+      tag    => 'openstack',
+    }
+  } else {
+    package { 'python-keystoneclient':
+      ensure => $ensure,
+      tag    => 'openstack',
+    }
   }
 }