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 |
4 |
5 --- openstack-keystone-6.1.0/manifests/params.pp.orig 2016-04-21 08:16:40.158969865 -0700 |
5 --- openstack-keystone-8.2.0/manifests/params.pp.orig 2016-08-07 11:19:17.404917169 -0700 |
6 +++ openstack-keystone-6.1.0/manifests/params.pp 2016-04-21 08:16:54.897183391 -0700 |
6 +++ openstack-keystone-8.2.0/manifests/params.pp 2016-08-07 11:22:50.916040310 -0700 |
7 @@ -1,11 +1,15 @@ |
7 @@ -2,13 +2,13 @@ |
8 +####################################################################### |
|
9 +# Oracle has modified the originally distributed contents of this file. |
|
10 +####################################################################### |
|
11 + |
|
12 # |
|
13 # This class contains the platform differences for keystone |
8 # This class contains the platform differences for keystone |
14 # |
9 # |
15 class keystone::params { |
10 class keystone::params { |
16 - $client_package_name = 'python-keystone' |
11 - $client_package_name = 'python-keystone' |
17 |
12 $keystone_user = 'keystone' |
|
13 $keystone_group = 'keystone' |
|
14 $keystone_wsgi_admin_script_path = '/usr/bin/keystone-wsgi-admin' |
|
15 $keystone_wsgi_public_script_path = '/usr/bin/keystone-wsgi-public' |
18 case $::osfamily { |
16 case $::osfamily { |
19 'Debian': { |
17 'Debian': { |
20 + $client_package_name = 'python-keystone' |
18 + $client_package_name = 'python-keystone' |
21 $package_name = 'keystone' |
19 $package_name = 'keystone' |
22 $service_name = 'keystone' |
20 $service_name = 'keystone' |
23 $keystone_wsgi_script_path = '/usr/lib/cgi-bin/keystone' |
21 $keystone_wsgi_script_path = '/usr/lib/cgi-bin/keystone' |
24 @@ -26,6 +30,7 @@ |
22 @@ -26,6 +26,7 @@ class keystone::params { |
25 } |
23 } |
26 } |
24 } |
27 'RedHat': { |
25 'RedHat': { |
28 + $client_package_name = 'python-keystone' |
26 + $client_package_name = 'python-keystone' |
29 $package_name = 'openstack-keystone' |
27 $package_name = 'openstack-keystone' |
30 $service_name = 'openstack-keystone' |
28 $service_name = 'openstack-keystone' |
31 $keystone_wsgi_script_path = '/var/www/cgi-bin/keystone' |
29 $keystone_wsgi_script_path = '/var/www/cgi-bin/keystone' |
32 @@ -34,5 +39,14 @@ |
30 @@ -35,5 +36,17 @@ class keystone::params { |
33 $keystone_wsgi_script_source = '/usr/share/keystone/keystone.wsgi' |
31 $pymysql_package_name = undef |
34 $paste_config = '/usr/share/keystone/keystone-dist-paste.ini' |
32 $mellon_package_name = 'mod_auth_mellon' |
35 } |
33 } |
36 + 'Solaris': { |
34 + 'Solaris': { |
37 + $client_package_name = 'library/python/keystoneclient' |
35 + $client_package_name = 'library/python/keystoneclient' |
38 + $package_name = 'cloud/openstack/keystone' |
36 + $package_name = 'cloud/openstack/keystone' |
39 + $service_name = 'application/openstack/keystone:default' |
37 + $service_name = 'application/openstack/keystone:default' |
40 + $keystone_wsgi_script_path = undef |
38 + $keystone_wsgi_script_path = '/usr/lib/python2.7/vendor-packages/keystone/httpd/main' |
41 + $python_memcache_package_name = 'python-memcached' |
39 + $python_memcache_package_name = 'python-memcached' |
|
40 + $sqlite_package_name = undef |
42 + $service_provider = undef |
41 + $service_provider = undef |
43 + $paste_config = undef |
42 + $pymysql_package_name = undef |
|
43 + $mellon_package_name = undef |
44 + } |
44 + } |
|
45 + |
45 } |
46 } |
46 } |
47 } |
|
48 |