diff options
| author | Adam Leff <adam@leff.co> | 2017-09-08 07:57:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-08 07:57:31 -0400 |
| commit | 5cd0ef1036b0fc82b6385655fee16176c506aadb (patch) | |
| tree | 9bfec5b022e10658d841f767912cf96393dc077f | |
| parent | a17a5baa70b44454b5f6b05fa930966fbf5c224e (diff) | |
| parent | 48defc6e5a8a89a37b4327dcafee9a3a4d9a2457 (diff) | |
| download | chef-5cd0ef1036b0fc82b6385655fee16176c506aadb.tar.gz | |
Merge pull request #6385 from tomdoherty/bonding_opts/ethtool_opts
Ensure we quote ETHTOOL/BONDING_OPTS
| -rw-r--r-- | lib/chef/provider/ifconfig/redhat.rb | 4 | ||||
| -rw-r--r-- | spec/unit/provider/ifconfig/redhat_spec.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/chef/provider/ifconfig/redhat.rb b/lib/chef/provider/ifconfig/redhat.rb index 1f4f6d972a..bf3d979e86 100644 --- a/lib/chef/provider/ifconfig/redhat.rb +++ b/lib/chef/provider/ifconfig/redhat.rb @@ -38,8 +38,8 @@ class Chef <% if new_resource.hwaddr %>HWADDR=<%= new_resource.hwaddr %><% end %> <% if new_resource.metric %>METRIC=<%= new_resource.metric %><% end %> <% if new_resource.mtu %>MTU=<%= new_resource.mtu %><% end %> -<% if new_resource.ethtool_opts %>ETHTOOL_OPTS=<%= new_resource.ethtool_opts %><% end %> -<% if new_resource.bonding_opts %>BONDING_OPTS=<%= new_resource.bonding_opts %><% end %> +<% if new_resource.ethtool_opts %>ETHTOOL_OPTS="<%= new_resource.ethtool_opts %>"<% end %> +<% if new_resource.bonding_opts %>BONDING_OPTS="<%= new_resource.bonding_opts %>"<% end %> <% if new_resource.master %>MASTER=<%= new_resource.master %><% end %> <% if new_resource.slave %>SLAVE=<%= new_resource.slave %><% end %> } diff --git a/spec/unit/provider/ifconfig/redhat_spec.rb b/spec/unit/provider/ifconfig/redhat_spec.rb index 0a91137416..d81f963450 100644 --- a/spec/unit/provider/ifconfig/redhat_spec.rb +++ b/spec/unit/provider/ifconfig/redhat_spec.rb @@ -56,8 +56,8 @@ describe Chef::Provider::Ifconfig::Redhat do expect(arg).to match(/^\s*DEVICE=eth0\s*$/) expect(arg).to match(/^\s*IPADDR=10\.0\.0\.1\s*$/) expect(arg).to match(/^\s*NETMASK=255\.255\.254\.0\s*$/) - expect(arg).to match(/^\s*ETHTOOL_OPTS=-A eth0 autoneg off\s*$/) - expect(arg).to match(/^\s*BONDING_OPTS=mode=active-backup miimon=100\s*$/) + expect(arg).to match(/^\s*ETHTOOL_OPTS="-A eth0 autoneg off"\s*$/) + expect(arg).to match(/^\s*BONDING_OPTS="mode=active-backup miimon=100"\s*$/) expect(arg).to match(/^\s*MASTER=bond0\s*$/) expect(arg).to match(/^\s*SLAVE=yes\s*$/) end |