|
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 |
|
3 CI testing. |
|
4 |
|
5 --- openstack-heat-6.1.0/manifests/api.pp.orig 2015-08-10 09:46:05.129811698 -0700 |
|
6 +++ openstack-heat-6.1.0/manifests/api.pp 2015-08-10 09:47:39.509312624 -0700 |
|
7 @@ -62,12 +62,22 @@ class heat::api ( |
|
8 include ::heat::params |
|
9 include ::heat::policy |
|
10 |
|
11 + if ( $heat::params::api_package_name != $heat::params::common_package_name ) { |
|
12 + ensure_packages([$heat::params::api_package_name], |
|
13 + { |
|
14 + ensure => $package_ensure, |
|
15 + name => $::heat::params::api_package_name, |
|
16 + tag => ['openstack'], |
|
17 + } |
|
18 + ) |
|
19 + } |
|
20 + |
|
21 Heat_config<||> ~> Service['heat-api'] |
|
22 Class['heat::policy'] -> Service['heat-api'] |
|
23 |
|
24 - Package['heat-api'] -> Heat_config<||> |
|
25 - Package['heat-api'] -> Class['heat::policy'] |
|
26 - Package['heat-api'] -> Service['heat-api'] |
|
27 + Package[$::heat::params::api_package_name] -> Heat_config<||> |
|
28 + Package[$::heat::params::api_package_name] -> Class['heat::policy'] |
|
29 + Package[$::heat::params::api_package_name] -> Service['heat-api'] |
|
30 |
|
31 if $use_ssl { |
|
32 if !$cert_file { |
|
33 @@ -78,12 +88,6 @@ class heat::api ( |
|
34 } |
|
35 } |
|
36 |
|
37 - package { 'heat-api': |
|
38 - ensure => $package_ensure, |
|
39 - name => $::heat::params::api_package_name, |
|
40 - tag => 'openstack', |
|
41 - } |
|
42 - |
|
43 if $manage_service { |
|
44 if $enabled { |
|
45 $service_ensure = 'running' |
|
46 @@ -99,7 +103,7 @@ class heat::api ( |
|
47 hasstatus => true, |
|
48 hasrestart => true, |
|
49 require => [Package['heat-common'], |
|
50 - Package['heat-api']], |
|
51 + Package[$::heat::params::api_package_name]], |
|
52 subscribe => $::heat::subscribe_sync_db, |
|
53 } |
|
54 |