commit 9d9b9d85d01888cd5ec380aed4687414f660e36a
author Hanna Arhipova <harhipova@mirantis.com> Mon Sep 09 10:13:16 2024 +0000
committer Gerrit Code Review <gerrit@172.18.228.132> Mon Sep 09 10:13:16 2024 +0000
tree f2809b15bed8d8feac5d949a67ebe190f03e7c03
parent 5de262d8d727df536e6280456055e7f80b07d4f6
parent f0fd5a98d65526f823bf176377ee2059a22142bb

Merge "Patch to fix test_rebuild_volume_backed_server" into mcp/caracal

tempest/api/compute/servers/test_server_actions.py

diff --git a/tempest/api/compute/servers/test_server_actions.py b/tempest/api/compute/servers/test_server_actions.py
index 21ed0cd..301db05 100644
--- a/tempest/api/compute/servers/test_server_actions.py
+++ b/tempest/api/compute/servers/test_server_actions.py
@@ -854,7 +854,7 @@
         # 4.Plain username/password auth, if a password was given.
         linux_client = remote_client.RemoteClient(
             self.get_server_ip(server, self.validation_resources),
-            self.ssh_user,
+            self.ssh_alt_user,
             password=None,
             pkey=self.validation_resources['keypair']['private_key'],
             server=server,

tempest/config.py

diff --git a/tempest/config.py b/tempest/config.py
index ae065ef..2fc4223 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -915,7 +915,7 @@
                default="root",
                help="User name used to authenticate to an instance."),
     cfg.StrOpt('image_alt_ssh_user',
-               default="root",
+               default="cirros",
                help="User name used to authenticate to an alt instance."),
     cfg.StrOpt('image_ssh_password',
                default="password",