19 - $fping_path = '/usr/sbin/fping', |
19 - $fping_path = '/usr/sbin/fping', |
20 + $fping_path = undef, |
20 + $fping_path = undef, |
21 $service_name = $::nova::params::api_service_name, |
21 $service_name = $::nova::params::api_service_name, |
22 $secure_proxy_ssl_header = $::os_service_default, |
22 $secure_proxy_ssl_header = $::os_service_default, |
23 # DEPRECATED PARAMETER |
23 # DEPRECATED PARAMETER |
24 @@ -226,6 +225,14 @@ class nova::api( |
24 @@ -226,6 +225,16 @@ class nova::api( |
25 include ::nova::policy |
25 include ::nova::policy |
26 include ::cinder::client |
26 include ::cinder::client |
27 |
27 |
28 + if ! $fping_path { |
28 + if ! $fping_path { |
29 + if $::osfamily == 'Solaris' { |
29 + if $::osfamily == 'Solaris' { |
30 + $fping_path_real = '/usr/bin/fping' |
30 + $fping_path_real = '/usr/bin/fping' |
31 + } else { |
31 + } else { |
32 + $fping_path_real = '/usr/sbin/fping' |
32 + $fping_path_real = '/usr/sbin/fping' |
33 + } |
33 + } |
|
34 + } else { |
|
35 + $fping_path_real = $fping_path |
34 + } |
36 + } |
35 + |
37 + |
36 if $ec2_listen_port or $ec2_workers or $keystone_ec2_url { |
38 if $ec2_listen_port or $ec2_workers or $keystone_ec2_url { |
37 warning('ec2_listen_port, ec2_workers and keystone_ec2_url are deprecated and have no effect. Deploy openstack/ec2-api instead.') |
39 warning('ec2_listen_port, ec2_workers and keystone_ec2_url are deprecated and have no effect. Deploy openstack/ec2-api instead.') |
38 } |
40 } |
39 @@ -311,7 +318,7 @@ class nova::api( |
41 @@ -311,7 +320,7 @@ class nova::api( |
40 'DEFAULT/metadata_workers': value => $metadata_workers; |
42 'DEFAULT/metadata_workers': value => $metadata_workers; |
41 'DEFAULT/use_forwarded_for': value => $use_forwarded_for; |
43 'DEFAULT/use_forwarded_for': value => $use_forwarded_for; |
42 'DEFAULT/default_floating_pool': value => $default_floating_pool; |
44 'DEFAULT/default_floating_pool': value => $default_floating_pool; |
43 - 'DEFAULT/fping_path': value => $fping_path; |
45 - 'DEFAULT/fping_path': value => $fping_path; |
44 + 'DEFAULT/fping_path': value => $fping_path_real; |
46 + 'DEFAULT/fping_path': value => $fping_path_real; |