|
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-neutron-6.1.0/manifests/init.pp.orig 2015-08-10 10:15:41.992660410 -0700 |
|
6 +++ openstack-neutron-6.1.0/manifests/init.pp 2015-08-10 10:16:24.401836047 -0700 |
|
7 @@ -235,7 +235,7 @@ class neutron ( |
|
8 $allow_sorting = false, |
|
9 $allow_overlapping_ips = false, |
|
10 $api_extensions_path = undef, |
|
11 - $root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf', |
|
12 + $root_helper = undef, |
|
13 $report_interval = '30', |
|
14 $memcache_servers = false, |
|
15 $control_exchange = 'neutron', |
|
16 @@ -312,18 +312,6 @@ class neutron ( |
|
17 validate_array($memcache_servers) |
|
18 } |
|
19 |
|
20 - File { |
|
21 - require => Package['neutron'], |
|
22 - owner => 'root', |
|
23 - group => 'neutron', |
|
24 - } |
|
25 - |
|
26 - file { '/etc/neutron': |
|
27 - ensure => directory, |
|
28 - } |
|
29 - |
|
30 - file { '/etc/neutron/neutron.conf': } |
|
31 - |
|
32 package { 'neutron': |
|
33 ensure => $package_ensure, |
|
34 name => $::neutron::params::package_name, |
|
35 @@ -351,7 +339,6 @@ class neutron ( |
|
36 'DEFAULT/api_extensions_path': value => $api_extensions_path; |
|
37 'DEFAULT/state_path': value => $state_path; |
|
38 'DEFAULT/lock_path': value => $lock_path; |
|
39 - 'agent/root_helper': value => $root_helper; |
|
40 'agent/report_interval': value => $report_interval; |
|
41 } |
|
42 |
|
43 @@ -374,6 +361,12 @@ class neutron ( |
|
44 } |
|
45 } |
|
46 |
|
47 + if $root_helper { |
|
48 + neutron_config { |
|
49 + 'agent/root_helper': value => $root_helper; |
|
50 + } |
|
51 + } |
|
52 + |
|
53 if $network_device_mtu { |
|
54 neutron_config { |
|
55 'DEFAULT/network_device_mtu': value => $network_device_mtu; |