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 |
4 |
5 --- openstack-heat-6.1.0/manifests/params.pp.orig 2016-04-21 08:02:17.732256206 -0700 |
5 --- openstack-heat-8.2.0/manifests/params.pp.orig 2016-04-21 08:02:17.732256206 -0700 |
6 +++ openstack-heat-6.1.0/manifests/params.pp 2016-04-21 08:02:43.009849321 -0700 |
6 +++ openstack-heat-8.2.0/manifests/params.pp 2016-04-21 08:02:43.009849321 -0700 |
7 @@ -1,3 +1,7 @@ |
7 @@ -1,3 +1,7 @@ |
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 # == Class: heat::params |
12 # == Class: heat::params |
13 # |
13 # |
14 # Parameters for puppet-heat |
14 # Parameters for puppet-heat |
15 @@ -45,10 +49,24 @@ |
15 @@ -46,10 +50,24 @@ |
16 } |
16 } |
17 } |
17 } |
18 } |
18 } |
19 + 'Solaris': { |
19 + 'Solaris': { |
20 + # package names |
20 + # package names |
32 + } |
32 + } |
33 default: { |
33 default: { |
34 fail("Unsupported osfamily: ${::osfamily} operatingsystem: \ |
34 fail("Unsupported osfamily: ${::osfamily} operatingsystem: \ |
35 ${::operatingsystem}, module ${module_name} only support osfamily \ |
35 ${::operatingsystem}, module ${module_name} only support osfamily \ |
36 -RedHat and Debian") |
36 -RedHat and Debian") |
37 +Solaris, RedHat, and Debian") |
37 +RedHat, Debian, and Solaris") |
38 } |
38 } |
39 } |
39 } |
40 } |
40 } |