chore: Disable host ssh key checking via ANSIBLE_HOST_KEY_CHECKING

Instead using "ansible_ssh_extra_args" to disable host key check, use the common env variable to disable it. Signed-off-by: Yihuang Yu <[email protected]>
autotest · Jul 30, 2024 · 58f91a6 · 58f91a6
1 parent fc9e1e8
commit 58f91a6
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 18 deletions.
diff --git a/provider/ansible.py b/provider/ansible.py
@@ -60,10 +60,10 @@ def _generate_cmd(self, extra_vars=None, addl_opts=None):
         :param addl_opts: Other ansible-playbook common options.
         :return: The generated ansible-playbook command line.
         """
-        playbook_cmd_options = []
+        playbook_cmd_options = ["ANSIBLE_HOST_KEY_CHECKING=false"]
         if self.callback_plugin:
-            playbook_cmd_options = [
-                'ANSIBLE_STDOUT_CALLBACK={}'.format(self.callback_plugin)]
+            playbook_cmd_options.append(
+                'ANSIBLE_STDOUT_CALLBACK={}'.format(self.callback_plugin))
         playbook_cmd_options.extend([self.program,
                                      self.site_yml,
                                      '-i {}'.format(self.inventory)])

diff --git a/qemu/tests/ansible_test.py b/qemu/tests/ansible_test.py
@@ -34,7 +34,6 @@ def run(test, params, env):
     ansible_callback_plugin = params.get("ansible_callback_plugin")
     ansible_connection_plugin = params.get("ansible_connection_plugin")
     ansible_addl_opts = params.get("ansible_addl_opts", "")
-    ansible_ssh_extra_args = params["ansible_ssh_extra_args"]
     ansible_extra_vars = params.get("ansible_extra_vars", "{}")
     custom_extra_vars = params.objects("custom_extra_vars")
     playbook_repo = params["playbook_repo"]
@@ -60,8 +59,7 @@ def run(test, params, env):
 
     error_context.base_context("Generate playbook related options.",
                                test.log.info)
-    extra_vars = {"ansible_ssh_extra_args": ansible_ssh_extra_args,
-                  "ansible_ssh_pass": guest_passwd,
+    extra_vars = {"ansible_ssh_pass": guest_passwd,
                   "test_harness_log_dir": test_harness_log_dir}
     extra_vars.update(json.loads(ansible_extra_vars))
     custom_params = params.object_params("extra_vars")

diff --git a/qemu/tests/ansible_with_responsive_migration.py b/qemu/tests/ansible_with_responsive_migration.py
@@ -37,7 +37,6 @@ def run(test, params, env):
     ansible_callback_plugin = params.get("ansible_callback_plugin")
     ansible_connection_plugin = params.get("ansible_connection_plugin")
     ansible_addl_opts = params.get("ansible_addl_opts", "")
-    ansible_ssh_extra_args = params["ansible_ssh_extra_args"]
     ansible_extra_vars = params.get("ansible_extra_vars", "{}")
     custom_extra_vars = params.objects("custom_extra_vars")
     playbook_repo = params["playbook_repo"]
@@ -67,8 +66,7 @@ def run(test, params, env):
 
     error_context.base_context("Generate playbook related options.",
                                test.log.info)
-    extra_vars = {"ansible_ssh_extra_args": ansible_ssh_extra_args,
-                  "ansible_ssh_pass": guest_passwd,
+    extra_vars = {"ansible_ssh_pass": guest_passwd,
                   "mq_port": mq_listen_port,
                   "test_harness_log_dir": test_harness_log_dir}
     extra_vars.update(json.loads(ansible_extra_vars))

diff --git a/qemu/tests/cfg/ansible_test.cfg b/qemu/tests/cfg/ansible_test.cfg
@@ -6,7 +6,6 @@
     toplevel_playbook = "site.yml"
     playbook_timeout = 600
     ansible_callback_plugin = debug
-    ansible_ssh_extra_args = "-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
     ansible_repo = ""
     # Here we can define an extra set of variables for the playbook with json format
     #ansible_extra_vars = '{"debug_msg": "Hello Ansible!", "force_handlers": true}'

diff --git a/qemu/tests/cfg/nested_block_resize.cfg b/qemu/tests/cfg/nested_block_resize.cfg
@@ -4,7 +4,6 @@
     toplevel_playbook = "site.yml"
     playbook_timeout = 600
     ansible_callback_plugin = debug
-    ansible_ssh_extra_args = "-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
     ansible_repo = ""
     only virtio_scsi
     wait_response_timeout = 1800

diff --git a/qemu/tests/cfg/nested_vsock_con_sockets.cfg b/qemu/tests/cfg/nested_vsock_con_sockets.cfg
@@ -5,7 +5,6 @@
     virt_test_type = qemu
     playbook_timeout = 600
     ansible_callback_plugin = debug
-    ansible_ssh_extra_args = "-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
     wait_response_timeout = 600
     vsocks = vhost_vsock0
     vsock_port = 2345

diff --git a/qemu/tests/nested_block_resize.py b/qemu/tests/nested_block_resize.py
@@ -78,7 +78,6 @@ def _on_status(obj, msg):
     ansible_callback_plugin = params.get("ansible_callback_plugin")
     ansible_connection_plugin = params.get("ansible_connection_plugin")
     ansible_addl_opts = params.get("ansible_addl_opts", "")
-    ansible_ssh_extra_args = params["ansible_ssh_extra_args"]
     ansible_extra_vars = params.get("ansible_extra_vars", "{}")
     playbook_repo = params["playbook_repo"]
     playbook_timeout = params.get_numeric("playbook_timeout")
@@ -98,8 +97,7 @@ def _on_status(obj, msg):
 
     error_context.base_context("Generate playbook related options.",
                                test.log.info)
-    extra_vars = {"ansible_ssh_extra_args": ansible_ssh_extra_args,
-                  "ansible_ssh_pass": guest_passwd,
+    extra_vars = {"ansible_ssh_pass": guest_passwd,
                   "mq_port": mq_listen_port,
                   "test_harness_log_dir": test_harness_log_dir}
     extra_vars.update(json.loads(ansible_extra_vars))

diff --git a/qemu/tests/nested_vsock_con_sockets.py b/qemu/tests/nested_vsock_con_sockets.py
@@ -77,7 +77,6 @@ def _send_file_from_host_to_l1(obj, msg):
     ansible_callback_plugin = params.get("ansible_callback_plugin")
     ansible_connection_plugin = params.get("ansible_connection_plugin")
     ansible_addl_opts = params.get("ansible_addl_opts", "")
-    ansible_ssh_extra_args = params["ansible_ssh_extra_args"]
     ansible_extra_vars = params.get("ansible_extra_vars", "{}")
     playbook_repo = params["playbook_repo"]
     playbook_timeout = params.get_numeric("playbook_timeout")
@@ -97,8 +96,7 @@ def _send_file_from_host_to_l1(obj, msg):
 
     error_context.base_context("Generate playbook related options.",
                                test.log.info)
-    extra_vars = {"ansible_ssh_extra_args": ansible_ssh_extra_args,
-                  "ansible_ssh_pass": guest_passwd,
+    extra_vars = {"ansible_ssh_pass": guest_passwd,
                   "mq_port": mq_port,
                   "test_harness_log_dir": test_harness_log_dir}
     extra_vars.update(json.loads(ansible_extra_vars))