|
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/engine.pp.orig 2015-08-10 09:48:29.999206790 -0700 |
|
6 +++ openstack-heat-6.1.0/manifests/engine.pp 2015-08-10 09:51:44.134426445 -0700 |
|
7 @@ -109,16 +109,21 @@ class heat::engine ( |
|
8 include ::heat |
|
9 include ::heat::params |
|
10 |
|
11 + if ( $heat::params::engine_package_name != $heat::params::common_package_name ) { |
|
12 + ensure_packages([$heat::params::engine_package_name], |
|
13 + { |
|
14 + ensure => $package_ensure, |
|
15 + name => $::heat::params::engine_package_name, |
|
16 + tag => ['openstack'], |
|
17 + notify => $::heat::subscribe_sync_db, |
|
18 + } |
|
19 + ) |
|
20 + } |
|
21 + |
|
22 Heat_config<||> ~> Service['heat-engine'] |
|
23 |
|
24 - Package['heat-engine'] -> Heat_config<||> |
|
25 - Package['heat-engine'] -> Service['heat-engine'] |
|
26 - package { 'heat-engine': |
|
27 - ensure => $package_ensure, |
|
28 - name => $::heat::params::engine_package_name, |
|
29 - tag => 'openstack', |
|
30 - notify => $::heat::subscribe_sync_db, |
|
31 - } |
|
32 + Package[$::heat::params::engine_package_name] -> Heat_config<||> |
|
33 + Package[$::heat::params::engine_package_name] -> Service['heat-engine'] |
|
34 |
|
35 if $manage_service { |
|
36 if $enabled { |
|
37 @@ -143,7 +148,7 @@ class heat::engine ( |
|
38 hasrestart => true, |
|
39 require => [ File['/etc/heat/heat.conf'], |
|
40 Package['heat-common'], |
|
41 - Package['heat-engine']], |
|
42 + Package[$::heat::params::engine_package_name]], |
|
43 subscribe => $::heat::subscribe_sync_db, |
|
44 } |
|
45 |