author | Drew Fisher <drew.fisher@oracle.com> |
Tue, 16 Feb 2016 13:47:43 -0800 | |
changeset 5464 | 6e2e17e6aa45 |
child 5860 | afd31ba91ee9 |
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 |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
5 |
--- openstack-nova-6.1.0/manifests/init.pp.orig 2015-08-10 11:07:11.797692743 -0700 |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
6 |
+++ openstack-nova-6.1.0/manifests/init.pp 2015-08-10 11:08:05.453328148 -0700 |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
7 |
@@ -397,12 +397,6 @@ class nova( |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
8 |
Package['nova-common'] -> Nova_config<| |> -> File['/etc/nova/nova.conf'] |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
9 |
Nova_config<| |> ~> Exec['post-nova_config'] |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
10 |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
11 |
- # TODO - see if these packages can be removed |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
12 |
- # they should be handled as package deps by the OS |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
13 |
- package { 'python-greenlet': |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
14 |
- ensure => present, |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
15 |
- } |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
16 |
- |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
17 |
if $install_utilities { |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
18 |
class { '::nova::utilities': } |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
19 |
} |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
20 |
@@ -411,23 +405,14 @@ class nova( |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
21 |
# allowing a resource to serve as a point where the configuration of nova begins |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
22 |
anchor { 'nova-start': } |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
23 |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
24 |
- package { 'python-nova': |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
25 |
- ensure => $ensure_package, |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
26 |
- require => Package['python-greenlet'], |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
27 |
- tag => ['openstack'], |
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 |
package { 'nova-common': |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
31 |
ensure => $ensure_package, |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
32 |
name => $::nova::params::common_package_name, |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
33 |
- require => [Package['python-nova'], Anchor['nova-start']], |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
34 |
+ require => Anchor['nova-start'], |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
35 |
tag => ['openstack'], |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
36 |
} |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
37 |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
38 |
file { '/etc/nova/nova.conf': |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
39 |
- mode => '0640', |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
40 |
- owner => 'nova', |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
41 |
- group => 'nova', |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
42 |
require => Package['nova-common'], |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
43 |
} |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
44 |
|
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
45 |
@@ -576,9 +561,6 @@ class nova( |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
46 |
if $log_dir { |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
47 |
file { $log_dir: |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
48 |
ensure => directory, |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
49 |
- mode => '0750', |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
50 |
- owner => 'nova', |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
51 |
- group => $::nova::params::nova_log_group, |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
52 |
require => Package['nova-common'], |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
53 |
} |
6e2e17e6aa45
PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
54 |
nova_config { 'DEFAULT/log_dir': value => $log_dir;} |