| author | Patrick Einheber <patrick.einheber@oracle.com> |
| Wed, 27 Apr 2016 14:55:10 -0700 | |
| changeset 5860 | afd31ba91ee9 |
| parent 5464 | 6e2e17e6aa45 |
| child 6817 | e4a26f447d0c |
| permissions | -rw-r--r-- |
|
5464
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
1 |
In-house patch to add support for Solaris 11.3 and 12.0. This patch |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
2 |
has not yet been submitted upstream due to requirements for 3rd party |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
3 |
CI testing. |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
4 |
|
|
5860
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5464
diff
changeset
|
5 |
--- openstack-heat-6.1.0/manifests/engine.pp.orig 2016-04-21 08:07:38.280309372 -0700 |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5464
diff
changeset
|
6 |
+++ openstack-heat-6.1.0/manifests/engine.pp 2016-04-21 08:07:53.510837943 -0700 |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5464
diff
changeset
|
7 |
@@ -1,3 +1,7 @@ |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5464
diff
changeset
|
8 |
+####################################################################### |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5464
diff
changeset
|
9 |
+# Oracle has modified the originally distributed contents of this file. |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5464
diff
changeset
|
10 |
+####################################################################### |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5464
diff
changeset
|
11 |
+ |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5464
diff
changeset
|
12 |
# == Class: heat::engine |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5464
diff
changeset
|
13 |
# |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5464
diff
changeset
|
14 |
# Installs & configure the heat engine service |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5464
diff
changeset
|
15 |
@@ -109,16 +113,21 @@ |
|
5464
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
16 |
include ::heat |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
17 |
include ::heat::params |
|
5860
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5464
diff
changeset
|
18 |
|
|
5464
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
19 |
+ if ( $heat::params::engine_package_name != $heat::params::common_package_name ) {
|
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
20 |
+ ensure_packages([$heat::params::engine_package_name], |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
21 |
+ {
|
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
22 |
+ ensure => $package_ensure, |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
23 |
+ name => $::heat::params::engine_package_name, |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
24 |
+ tag => ['openstack'], |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
25 |
+ notify => $::heat::subscribe_sync_db, |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
26 |
+ } |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
27 |
+ ) |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
28 |
+ } |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
29 |
+ |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
30 |
Heat_config<||> ~> Service['heat-engine'] |
|
5860
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5464
diff
changeset
|
31 |
|
|
5464
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
32 |
- Package['heat-engine'] -> Heat_config<||> |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
33 |
- Package['heat-engine'] -> Service['heat-engine'] |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
34 |
- package { 'heat-engine':
|
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
35 |
- ensure => $package_ensure, |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
36 |
- name => $::heat::params::engine_package_name, |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
37 |
- tag => 'openstack', |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
38 |
- notify => $::heat::subscribe_sync_db, |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
39 |
- } |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
40 |
+ Package[$::heat::params::engine_package_name] -> Heat_config<||> |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
41 |
+ Package[$::heat::params::engine_package_name] -> Service['heat-engine'] |
|
5860
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5464
diff
changeset
|
42 |
|
|
5464
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
43 |
if $manage_service {
|
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
44 |
if $enabled {
|
|
5860
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5464
diff
changeset
|
45 |
@@ -143,7 +152,7 @@ |
|
5464
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
46 |
hasrestart => true, |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
47 |
require => [ File['/etc/heat/heat.conf'], |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
48 |
Package['heat-common'], |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
49 |
- Package['heat-engine']], |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
50 |
+ Package[$::heat::params::engine_package_name]], |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
51 |
subscribe => $::heat::subscribe_sync_db, |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
52 |
} |
|
5860
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5464
diff
changeset
|
53 |