openstack/fuel-library
Code Issues Proposed changes

revert. Use high-priority operation with puppet so scareful...

Browse Source
This commit is contained in:
Sergey Vasilenko 2013-10-07 21:20:48 +04:00
parent 152bc40c7b
commit fb26996b3c
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/parser/functions/generate_network_config.rb
View File

@ -70,21 +70,21 @@ module L23network
raise(Puppet::ParseError, "Unnamed transformation: '#{action}'.") raise(Puppet::ParseError, "Unnamed transformation: '#{action}'.")
end end
name = rv[:name] name = rv[:name]
if not rv[:bridge].is_a? String && !["add-patch", "add-br"].index(action) if not rv[:bridge].is_a? String and !["add-patch", "add-br"].index(action)
raise(Puppet::ParseError, "Undefined bridge for transformation '#{action}' with name '#{name}'.") raise(Puppet::ParseError, "Undefined bridge for transformation '#{action}' with name '#{name}'.")
end end
if action == "add-patch" if action == "add-patch"
if not rv[:bridges].is_a? Array && rv[:bridges].size() != 2 if not rv[:bridges].is_a? Array and rv[:bridges].size() != 2
raise(Puppet::ParseError, "Transformation patch have wrong 'bridges' parameter.") raise(Puppet::ParseError, "Transformation patch have wrong 'bridges' parameter.")
end end
name = "patch__#{rv[:bridges][0]}__#{rv[:bridges][1]}" name = "patch__#{rv[:bridges][0]}__#{rv[:bridges][1]}"
if not rv[:peers].is_a? Array && rv[:peers].size() != 2 if not rv[:peers].is_a? Array and rv[:peers].size() != 2
raise(Puppet::ParseError, "Transformation patch '#{name}' have wrong 'peers' parameter.") raise(Puppet::ParseError, "Transformation patch '#{name}' have wrong 'peers' parameter.")
end end
rv[:name] = name rv[:name] = name
end end
if action == "add-bond" if action == "add-bond"
if not rv[:interfaces].is_a? Array || rv[:interfaces].size() != 2 if not rv[:interfaces].is_a? Array or rv[:interfaces].size() != 2
raise(Puppet::ParseError, "Transformation bond '#{name}' have wrong 'interfaces' parameter.") raise(Puppet::ParseError, "Transformation bond '#{name}' have wrong 'interfaces' parameter.")
end end
# rv[:interfaces].each do |i| # rv[:interfaces].each do |i|