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