diff options
| author | Tim Smith <tsmith@chef.io> | 2020-10-26 17:05:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-26 17:05:09 -0700 |
| commit | bca616120ad5bcfd73a073380ffe0b1f1909d5f0 (patch) | |
| tree | f9d2b316b1a0a01756ee329494e462989dbc2758 | |
| parent | ed67cb7fad4c000dc791695602daa2f4c9d13b97 (diff) | |
| parent | eb2263cb4f55e328ee92de670fdf1d60463ae6f6 (diff) | |
| download | chef-bca616120ad5bcfd73a073380ffe0b1f1909d5f0.tar.gz | |
Merge pull request #10555 from chef/ifconfig_fedora_33
ifconfig is not compatible with Fedora 33 or later
| -rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/_ifconfig.rb | 2 | ||||
| -rw-r--r-- | lib/chef/resource/ifconfig.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/_ifconfig.rb b/kitchen-tests/cookbooks/end_to_end/recipes/_ifconfig.rb index 149b2cb65c..2a02636ac2 100644 --- a/kitchen-tests/cookbooks/end_to_end/recipes/_ifconfig.rb +++ b/kitchen-tests/cookbooks/end_to_end/recipes/_ifconfig.rb @@ -1,3 +1,5 @@ +return if fedora? && node["platform_version"] >= "33" # ifconfig does not support the new network manager keyfile format + execute "create virtual interface for testing" do command "ifconfig eth0:0 123.123.22.22" end diff --git a/lib/chef/resource/ifconfig.rb b/lib/chef/resource/ifconfig.rb index 223e10967f..2c5262fa97 100644 --- a/lib/chef/resource/ifconfig.rb +++ b/lib/chef/resource/ifconfig.rb @@ -26,7 +26,7 @@ class Chef provides :ifconfig - description "Use the **ifconfig** resource to manage interfaces on Unix and Linux systems. Note: This resource requires the ifconfig binary to be present on the system and may require additional packages to be installed first. On Ubuntu 18.04 or later you will need to install the `ifupdown` package, which disables the built in Netplan functionality." + description "Use the **ifconfig** resource to manage interfaces on Unix and Linux systems. Note: This resource requires the ifconfig binary to be present on the system and may require additional packages to be installed first. On Ubuntu 18.04 or later you will need to install the `ifupdown` package, which disables the built in Netplan functionality. Warning: This resource will not work with Fedora release 33 or later." examples <<~DOC **Configure a network interface with a static IP** |