components/ruby/puppet-modules/openstack-keystone/patches/04-client.patch
author Rich Burridge <rich.burridge@oracle.com>
Tue, 02 May 2017 17:33:26 -0700
changeset 7964 d9801318ed3d
parent 6817 e4a26f447d0c
permissions -rw-r--r--
25981468 Build ilmbase and openexr with the GNU compilers
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5464
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     1
In-house patch to add support for Solaris 11.3 and 12.0.  This patch
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     2
has not yet been submitted upstream due to requirements for 3rd party
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     3
CI testing.
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     4
5860
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
     5
--- openstack-keystone-6.1.0/manifests/client.pp.orig	2016-04-21 08:18:25.417368104 -0700
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
     6
+++ openstack-keystone-6.1.0/manifests/client.pp	2016-04-21 08:18:42.546437765 -0700
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
     7
@@ -1,3 +1,7 @@
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
     8
+#######################################################################
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
     9
+# Oracle has modified the originally distributed contents of this file.
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
    10
+#######################################################################
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
    11
+
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
    12
 # == Class: keystone::client
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
    13
 #
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
    14
 # Installs Keystone client.
6817
e4a26f447d0c 24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 5860
diff changeset
    15
@@ -19,10 +23,17 @@ class keystone::client (
e4a26f447d0c 24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 5860
diff changeset
    16
e4a26f447d0c 24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 5860
diff changeset
    17
   include ::keystone::deps
e4a26f447d0c 24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 5860
diff changeset
    18
5464
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    19
-  package { 'python-keystoneclient':
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    20
-    ensure => $ensure,
6817
e4a26f447d0c 24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 5860
diff changeset
    21
-    name   => $client_package_name,
5464
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    22
-    tag    => 'openstack',
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    23
+  if $::osfamily == 'Solaris' {
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    24
+    package { 'library/python/keystoneclient':
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    25
+      ensure => $ensure,
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    26
+      tag    => 'openstack',
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    27
+    }
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    28
+  } else {
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    29
+    package { 'python-keystoneclient':
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    30
+      ensure => $ensure,
6817
e4a26f447d0c 24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 5860
diff changeset
    31
+      name   => $client_package_name,
5464
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    32
+      tag    => 'openstack',
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    33
+    }
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    34
   }
6817
e4a26f447d0c 24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 5860
diff changeset
    35
e4a26f447d0c 24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 5860
diff changeset
    36
   include '::openstacklib::openstackclient'