openstack
/
fuel-library
Code Issues Proposed changes

Merge "Fix adding bond to bridge error"

This commit is contained in:
Jenkins 2015-08-28 16:47:24 +00:00 committed by Gerrit Code Review
parent 0536e532aa 38f5ba642f
commit 36dd5a798e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deployment/puppet/l23network/lib/puppet/provider/l2_bond/ovs.rb
View File

@ -30,7 +30,7 @@ Puppet::Type.type(:l2_bond).provide(:ovs, :parent => Puppet::Provider::Ovs_base)
end
begin
vsctl("add-bond", @resource[:bridge], @resource[:bond], @resource[:slaves])
vsctl('--may-exist', 'add-bond', @resource[:bridge], @resource[:bond], @resource[:slaves])
rescue Puppet::ExecutionFailure => error
raise Puppet::ExecutionFailure, "Can't add bond '#{@resource[:bond]}'\n#{error}"
end
@ -47,7 +47,7 @@ Puppet::Type.type(:l2_bond).provide(:ovs, :parent => Puppet::Provider::Ovs_base)
end
def destroy
vsctl("del-port", @resource[:bridge], @resource[:bond])
vsctl('del-port', @resource[:bridge], @resource[:bond])
end
def flush
@ -85,7 +85,7 @@ Puppet::Type.type(:l2_bond).provide(:ovs, :parent => Puppet::Provider::Ovs_base)
# override property if it should be given as string for ovs and as integer for native linux
val = allowed_properties[prop.to_sym][:override_integer][val.to_i] || allowed_properties[prop.to_sym][:override_integer][0]
end
vsctl('--', "set", "Port", @resource[:bond], "#{allowed_properties[prop.to_sym][:property]}=#{val}") if ! val.nil?
vsctl('--', 'set', 'Port', @resource[:bond], "#{allowed_properties[prop.to_sym][:property]}=#{val}") if ! val.nil?
end
end
end
@ -111,4 +111,4 @@ Puppet::Type.type(:l2_bond).provide(:ovs, :parent => Puppet::Provider::Ovs_base)
@property_flush[:interface_properties] = val
end
end
# vim: set ts=2 sw=2 et :
# vim: set ts=2 sw=2 et :