Shift mangling of /etc/hosts to the end of all postinstall scripts.

diff --git a/lib/create_terraform/handler/files.py b/lib/create_terraform/handler/files.py
index 862e82fa34a3033d2c08e857b66712f72742d2ea..bd20857837d6dea3dcfb9812a338226f76446a58 100644 (file)
--- a/lib/create_terraform/handler/files.py
+++ b/lib/create_terraform/handler/files.py
@@ -826,11 +826,6 @@ class CrTfHandlerFilesMixin():
         commands.append("Setting gecos of root to 'root {}'.".format(vm.fqdn))
         commands.append("usermod -c 'root {}' root".format(vm.fqdn))
 
-        commands.append("echo '------------------------------'")
-        commands.append("chmod -v +x /tmp/fix-etc-hosts")
-        commands.append("/tmp/fix-etc-hosts --no-ipv6")
-        commands.append("rm -fv /tmp/fix-etc-hosts")
-
         commands.append("echo '------------------------------'")
         commands.append("chmod -v +x /tmp/conf-resolver")
         cmd = '/tmp/conf-resolver'
@@ -885,6 +880,10 @@ class CrTfHandlerFilesMixin():
             commands.append(cmd)
             commands.append("rm -fv /tmp/init-puppet")
 
+        commands.append("echo '------------------------------'")
+        commands.append("chmod -v +x /tmp/fix-etc-hosts")
+        commands.append("/tmp/fix-etc-hosts --no-ipv6")
+
         content += '  provisioner "remote-exec" {\n'
         content += '    inline = [\n'
         for cmd in commands:
@@ -983,17 +982,26 @@ class CrTfHandlerFilesMixin():
             ca=self.config.puppetca, h=vm.fqdn)
 
         command_list = [
+            "echo '------------------------------'",
             "/opt/puppetlabs/bin/puppet agent --test || true",
             "/usr/bin/systemctl start puppet.service",
             "/usr/bin/systemctl enable puppet.service",
-            "chmod +x /tmp/update-all-packages",
+            "echo '------------------------------'",
+            "chmod -v +x /tmp/update-all-packages",
             "/tmp/update-all-packages",
             "rm -fv /tmp/update-all-packages",
         ]
+
         if vm.is_rhel:
-            command_list.append("chmod +x /tmp/update-networkmanager")
+            command_list.append("echo '------------------------------'")
+            command_list.append("chmod -v +x /tmp/update-networkmanager")
             command_list.append("/tmp/update-networkmanager -v")
             command_list.append("rm -fv /tmp/update-networkmanager")
+
+        command_list.append("echo '------------------------------'")
+        command_list.append("/tmp/fix-etc-hosts --no-ipv6")
+        command_list.append("rm -fv /tmp/fix-etc-hosts")
+
         command_list.append("rm -fv /tmp/functions.rc")
         commands = ',\n      '.join(map(lambda x: '"' + x + '"', command_list))
 
@@ -1057,14 +1065,22 @@ class CrTfHandlerFilesMixin():
     def _only_update_packages(self, vm):
 
         command_list = [
-            "chmod +x /tmp/update-all-packages",
+            "echo '------------------------------'",
+            "chmod -v +x /tmp/update-all-packages",
             "/tmp/update-all-packages",
             "rm -fv /tmp/update-all-packages",
         ]
+
         if vm.is_rhel:
-            command_list.append("chmod +x /tmp/update-networkmanager")
+            command_list.append("echo '------------------------------'")
+            command_list.append("chmod -v +x /tmp/update-networkmanager")
             command_list.append("/tmp/update-networkmanager -v")
             command_list.append("rm -fv /tmp/update-networkmanager")
+
+        command_list.append("echo '------------------------------'")
+        command_list.append("/tmp/fix-etc-hosts --no-ipv6")
+        command_list.append("rm -fv /tmp/fix-etc-hosts")
+
         command_list.append("rm -fv /tmp/functions.rc")
         commands = ',\n      '.join(map(lambda x: '"' + x + '"', command_list))