openstack
/
fuel-library
Code Issues Proposed changes

Merge "Fix openstack firewall tests under puppet4"

This commit is contained in:
Jenkins 2016-03-29 16:58:15 +00:00 committed by Gerrit Code Review
parent 6df3c16dc5 71008d6e36
commit 99f4909ad8
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment/puppet/openstack/spec/functions/prepare_firewall_rules__spec.rb
View File

@ -5,11 +5,7 @@ describe 'function to prepare hash of firewall rules for multiple networks' do
def setup_scope
@compiler = Puppet::Parser::Compiler.new(Puppet::Node.new("floppy", :environment => 'production'))
if Puppet.version =~ /^3\./
@scope = Puppet::Parser::Scope.new(@compiler)
else
@scope = Puppet::Parser::Scope.new(:compiler => @compiler)
end
@scope = Puppet::Parser::Scope.new(@compiler)
@topscope = @topscope
@scope.parent = @topscope
Puppet::Parser::Functions.function(:prepare_firewall_rules)