24745284 openstack-nova puppet module's solaris_zones.pp ... (don't be hasty)
--- a/components/ruby/puppet-modules/openstack-nova/patches/06-api.patch Tue Sep 27 16:00:10 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-nova/patches/06-api.patch Wed Sep 28 11:51:25 2016 -0700
@@ -21,7 +21,7 @@
$service_name = $::nova::params::api_service_name,
$secure_proxy_ssl_header = $::os_service_default,
# DEPRECATED PARAMETER
-@@ -226,6 +225,14 @@ class nova::api(
+@@ -226,6 +225,16 @@ class nova::api(
include ::nova::policy
include ::cinder::client
@@ -31,12 +31,14 @@
+ } else {
+ $fping_path_real = '/usr/sbin/fping'
+ }
++ } else {
++ $fping_path_real = $fping_path
+ }
+
if $ec2_listen_port or $ec2_workers or $keystone_ec2_url {
warning('ec2_listen_port, ec2_workers and keystone_ec2_url are deprecated and have no effect. Deploy openstack/ec2-api instead.')
}
-@@ -311,7 +318,7 @@ class nova::api(
+@@ -311,7 +320,7 @@ class nova::api(
'DEFAULT/metadata_workers': value => $metadata_workers;
'DEFAULT/use_forwarded_for': value => $use_forwarded_for;
'DEFAULT/default_floating_pool': value => $default_floating_pool;