openstack/puppet-openstacklib
Code Issues Proposed changes

Merge "Restore defaults for combine and failonfail in openstack command" into stable/queens

Browse Source
This commit is contained in:
Zuul
2019-10-08 15:28:21 +00:00
committed by Gerrit Code Review
parent 90895e5215 b62d3c6da8
commit 3ee8c4cfea
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/puppet/provider/openstack.rb
View File

@@ -45,7 +45,7 @@ class Puppet::Provider::Openstack < Puppet::Provider
begin begin
action = args[1] action = args[1]
Timeout.timeout(command_timeout(action)) do Timeout.timeout(command_timeout(action)) do
execute([command(:openstack_command)] + args, override_locale: false) execute([command(:openstack_command)] + args, override_locale: false, failonfail: true, combine: true)
end end
rescue Timeout::Error rescue Timeout::Error
raise Puppet::ExecutionFailure, "Command: 'openstack #{args.inspect}' has been running for more than #{command_timeout(action)} seconds" raise Puppet::ExecutionFailure, "Command: 'openstack #{args.inspect}' has been running for more than #{command_timeout(action)} seconds"