Merge pull request #44346 from gtmanfred/2017.7

remove binding from erb template rendering (2017.7)
This commit is contained in:
Nicole Thomas 2017-10-30 16:57:18 -04:00 committed by GitHub
commit d586b3bf97
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -5,7 +5,7 @@
<% driverfile = ENV['SALT_KITCHEN_DRIVER'] || '.kitchen/driver.yml' %>
<% if File.exists?(driverfile) %>
<%= ERB.new(File.read(driverfile)).result(binding) %>
<%= ERB.new(File.read(driverfile)).result %>
<% else %>
driver:
name: docker
@ -51,7 +51,7 @@ provisioner:
- git.salt
- kitchen
<% if File.exists?(platformsfile) %>
<%= ERB.new(File.read(platformsfile)).result(binding) %>
<%= ERB.new(File.read(platformsfile)).result %>
<% else %>
platforms:
- name: fedora