equal
deleted
inserted
replaced
1 In-house patch to add support for Solaris 11.3 and 12.0. This patch |
1 In-house patch to add support for Solaris 11.3 and 12.0. This patch |
2 has not yet been submitted upstream due to requirements for 3rd party |
2 has not yet been submitted upstream due to requirements for 3rd party |
3 CI testing. |
3 CI testing. |
4 --- openstack-keystone-6.1.0/manifests/params.pp.~1~ 2015-05-20 15:52:29.000000000 -0600 |
4 |
5 +++ openstack-keystone-6.1.0/manifests/params.pp 2015-06-01 13:41:27.577020809 -0600 |
5 --- openstack-keystone-6.1.0/manifests/params.pp.orig 2016-04-21 08:16:40.158969865 -0700 |
6 @@ -2,10 +2,10 @@ |
6 +++ openstack-keystone-6.1.0/manifests/params.pp 2016-04-21 08:16:54.897183391 -0700 |
|
7 @@ -1,11 +1,15 @@ |
|
8 +####################################################################### |
|
9 +# Oracle has modified the originally distributed contents of this file. |
|
10 +####################################################################### |
|
11 + |
|
12 # |
7 # This class contains the platform differences for keystone |
13 # This class contains the platform differences for keystone |
8 # |
14 # |
9 class keystone::params { |
15 class keystone::params { |
10 - $client_package_name = 'python-keystone' |
16 - $client_package_name = 'python-keystone' |
11 |
17 |
13 'Debian': { |
19 'Debian': { |
14 + $client_package_name = 'python-keystone' |
20 + $client_package_name = 'python-keystone' |
15 $package_name = 'keystone' |
21 $package_name = 'keystone' |
16 $service_name = 'keystone' |
22 $service_name = 'keystone' |
17 $keystone_wsgi_script_path = '/usr/lib/cgi-bin/keystone' |
23 $keystone_wsgi_script_path = '/usr/lib/cgi-bin/keystone' |
18 @@ -26,6 +26,7 @@ class keystone::params { |
24 @@ -26,6 +30,7 @@ |
19 } |
25 } |
20 } |
26 } |
21 'RedHat': { |
27 'RedHat': { |
22 + $client_package_name = 'python-keystone' |
28 + $client_package_name = 'python-keystone' |
23 $package_name = 'openstack-keystone' |
29 $package_name = 'openstack-keystone' |
24 $service_name = 'openstack-keystone' |
30 $service_name = 'openstack-keystone' |
25 $keystone_wsgi_script_path = '/var/www/cgi-bin/keystone' |
31 $keystone_wsgi_script_path = '/var/www/cgi-bin/keystone' |
26 @@ -34,5 +35,14 @@ class keystone::params { |
32 @@ -34,5 +39,14 @@ |
27 $keystone_wsgi_script_source = '/usr/share/keystone/keystone.wsgi' |
33 $keystone_wsgi_script_source = '/usr/share/keystone/keystone.wsgi' |
28 $paste_config = '/usr/share/keystone/keystone-dist-paste.ini' |
34 $paste_config = '/usr/share/keystone/keystone-dist-paste.ini' |
29 } |
35 } |
30 + 'Solaris': { |
36 + 'Solaris': { |
31 + $client_package_name = 'library/python/keystoneclient' |
37 + $client_package_name = 'library/python/keystoneclient' |