Merge pull request #8148 from mikefaille/netfixRHEL

Revert "Fix `service network restart` on RHEL-7 / Fedora"
hashicorp · Jan 5, 2017 · 5004f37 · 5004f37
2 parents 5bbe9c9 + 9661134
commit 5004f37
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/plugins/guests/redhat/cap/change_host_name.rb b/plugins/guests/redhat/cap/change_host_name.rb
@@ -31,12 +31,8 @@ def self.change_host_name(machine, name)
                 sed -i'' '1i 127.0.0.1\\t#{name}\\t#{basename}' /etc/hosts
               }
 
-              # Restart network (through NetworkManager if running)
-              if service NetworkManager status 2>&1 | grep -q running; then
-                service NetworkManager restart
-              else
-                service network restart
-              fi
+              # Restart network
+              service network restart
             EOH
           end
         end

diff --git a/plugins/guests/redhat/cap/configure_networks.rb b/plugins/guests/redhat/cap/configure_networks.rb
@@ -36,7 +36,7 @@ def self.configure_networks(machine, networks)
 
             # Add the new interface and bring it back up
             final_path = "#{network_scripts_dir}/ifcfg-#{network[:device]}"
-            commands << <<-EOH.gsub(/^ {14}/, '')
+            commands << <<-EOH.gsub(/^ */, '')
               # Down the interface before munging the config file. This might
               # fail if the interface is not actually set up yet so ignore
               # errors.
@@ -48,13 +48,9 @@ def self.configure_networks(machine, networks)
             EOH
           end
 
-          commands << <<-EOH.gsub(/^ {12}/, '')
-            # Restart network (through NetworkManager if running)
-            if service NetworkManager status 2>&1 | grep -q running; then
-              service NetworkManager restart
-            else
-              service network restart
-            fi
+          commands << <<-EOH.gsub(/^ */, '')
+            # Restart network
+            service network restart
           EOH
 
           comm.sudo(commands.join("\n"))