haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #7926 from chrisroberts/networking/rhel 

guests/redhat: Force NetworkManager to reload device configurations
This commit is contained in:
Chris Roberts 2016-10-25 14:41:07 -07:00 committed by GitHub
parent 486960d676 67f3c8b48c
commit 365b98fee6
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/guests/redhat/cap/configure_networks.rb
View File

@ -40,13 +40,11 @@ module VagrantPlugins
# Down the interface before munging the config file. This might # Down the interface before munging the config file. This might
# fail if the interface is not actually set up yet so ignore # fail if the interface is not actually set up yet so ignore
# errors. # errors.
/sbin/ifdown '#{network[:device]}' || true /sbin/ifdown '#{network[:device]}'
# Move new config into place # Move new config into place
mv -f '#{remote_path}' '#{final_path}' mv -f '#{remote_path}' '#{final_path}'
# attempt to force network manager to reload configurations
# Bring the interface up nmcli c reload || true
ARPCHECK=no /sbin/ifup '#{network[:device]}'
EOH EOH
end end

5
test/unit/plugins/guests/redhat/cap/configure_networks_test.rb
View File

@ -56,9 +56,10 @@ describe "VagrantPlugins::GuestRedHat::Cap::ConfigureNetworks" do
cap.configure_networks(machine, [network_1, network_2]) cap.configure_networks(machine, [network_1, network_2])
expect(comm.received_commands[0]).to match(/\/sbin\/ifdown 'eth1'/) expect(comm.received_commands[0]).to match(/\/sbin\/ifdown 'eth1'/)
expect(comm.received_commands[0]).to match(/\/sbin\/ifup 'eth1'/) expect(comm.received_commands[0]).to match(/ifcfg-eth1/)
expect(comm.received_commands[0]).to match(/\/sbin\/ifdown 'eth2'/) expect(comm.received_commands[0]).to match(/\/sbin\/ifdown 'eth2'/)
expect(comm.received_commands[0]).to match(/\/sbin\/ifup 'eth2'/) expect(comm.received_commands[0]).to match(/ifcfg-eth2/)
expect(comm.received_commands[0]).to match(/nmcli c reload/)
end end
end end
end end