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-glance-6.1.0/manifests/params.pp.orig 2016-04-21 07:49:15.937218438 -0700 |
5 --- openstack-glance-8.0.1/manifests/params.pp.orig 2016-05-06 08:03:31.669873231 -0700 |
6 +++ openstack-glance-6.1.0/manifests/params.pp 2016-04-21 07:49:38.722449269 -0700 |
6 +++ openstack-glance-8.0.1/manifests/params.pp 2016-05-06 08:06:03.214534543 -0700 |
7 @@ -1,14 +1,15 @@ |
7 @@ -1,14 +1,16 @@ |
8 +####################################################################### |
8 +####################################################################### |
9 +# Oracle has modified the originally distributed contents of this file. |
9 +# Oracle has modified the originally distributed contents of this file. |
10 +####################################################################### |
10 +####################################################################### |
11 + |
11 + |
12 # these parameters need to be accessed from several locations and |
12 # these parameters need to be accessed from several locations and |
13 # should be considered to be constant |
13 # should be considered to be constant |
14 class glance::params { |
14 class glance::params { |
15 - |
15 |
16 - $client_package_name = 'python-glanceclient' |
16 - $client_package_name = 'python-glanceclient' |
17 - |
17 - |
18 - $cache_cleaner_command = 'glance-cache-cleaner' |
18 - $cache_cleaner_command = 'glance-cache-cleaner' |
19 - $cache_pruner_command = 'glance-cache-pruner' |
19 - $cache_pruner_command = 'glance-cache-pruner' |
20 - |
20 - |
22 'RedHat': { |
22 'RedHat': { |
23 + $client_package_name = 'python-glanceclient' |
23 + $client_package_name = 'python-glanceclient' |
24 + $cache_cleaner_command = 'glance-cache-cleaner' |
24 + $cache_cleaner_command = 'glance-cache-cleaner' |
25 + $cache_pruner_command = 'glance-cache-pruner' |
25 + $cache_pruner_command = 'glance-cache-pruner' |
26 $api_package_name = 'openstack-glance' |
26 $api_package_name = 'openstack-glance' |
|
27 $glare_package_name = 'openstack-glance' |
27 $registry_package_name = 'openstack-glance' |
28 $registry_package_name = 'openstack-glance' |
28 $api_service_name = 'openstack-glance-api' |
29 @@ -24,6 +26,9 @@ class glance::params { |
29 @@ -21,6 +22,9 @@ |
30 $pymysql_package_name = undef |
30 } |
|
31 } |
31 } |
32 'Debian': { |
32 'Debian': { |
33 + $client_package_name = 'python-glanceclient' |
33 + $client_package_name = 'python-glanceclient' |
34 + $cache_cleaner_command = 'glance-cache-cleaner' |
34 + $cache_cleaner_command = 'glance-cache-cleaner' |
35 + $cache_pruner_command = 'glance-cache-pruner' |
35 + $cache_pruner_command = 'glance-cache-pruner' |
36 $api_package_name = 'glance-api' |
36 $api_package_name = 'glance-api' |
|
37 $glare_package_name = 'glance-glare' |
37 $registry_package_name = 'glance-registry' |
38 $registry_package_name = 'glance-registry' |
38 $api_service_name = 'glance-api' |
39 @@ -34,6 +39,20 @@ class glance::params { |
39 @@ -28,8 +32,19 @@ |
40 $sqlite_package_name = 'python-pysqlite2' |
40 $db_sync_command = 'glance-manage --config-file=/etc/glance/glance-registry.conf db_sync' |
41 $pymysql_package_name = 'python-pymysql' |
41 $pyceph_package_name = 'python-ceph' |
|
42 } |
42 } |
43 + 'Solaris': { |
43 + 'Solaris': { |
44 + $client_package_name = 'library/python/glanceclient' |
44 + $client_package_name = 'library/python/glanceclient' |
45 + $pyceph_package_name = undef |
|
46 + $cache_cleaner_command = '/usr/lib/glance/glance-cache-cleaner' |
45 + $cache_cleaner_command = '/usr/lib/glance/glance-cache-cleaner' |
47 + $cache_pruner_command = '/usr/lib/glance/glance-cache-pruner' |
46 + $cache_pruner_command = '/usr/lib/glance/glance-cache-pruner' |
48 + $api_package_name = 'cloud/openstack/glance' |
47 + $api_package_name = 'cloud/openstack/glance' |
|
48 + $glare_package_name = undef |
49 + $registry_package_name = 'cloud/openstack/glance' |
49 + $registry_package_name = 'cloud/openstack/glance' |
50 + $api_service_name = 'application/openstack/glance/glance-api' |
50 + $api_service_name = 'application/openstack/glance/glance-api' |
|
51 + $glare_service_name = undef |
51 + $registry_service_name = 'application/openstack/glance/glance-registry' |
52 + $registry_service_name = 'application/openstack/glance/glance-registry' |
52 + $db_sync_command = undef |
53 + $pyceph_package_name = undef |
|
54 + $sqlite_package_name = undef |
|
55 + $pymysql_package_name = undef |
53 + } |
56 + } |
54 default: { |
57 default: { |
55 - fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat and Debian") |
58 fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat and Debian") |
56 + fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily Solaris, RedHat, and Debian") |
|
57 } |
59 } |
58 } |
|
59 |
|