[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 01/10] tests/vm: Fix issues in gen_cloud_init_iso
From: |
Robert Foley |
Subject: |
[PATCH v4 01/10] tests/vm: Fix issues in gen_cloud_init_iso |
Date: |
Thu, 12 Mar 2020 10:27:19 -0400 |
Fixed issue caused by dependencies on a later
set of patches that have not been merged yet.
Signed-off-by: Robert Foley <address@hidden>
---
tests/vm/basevm.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
index 8400b0e07f..db479a65fd 100644
--- a/tests/vm/basevm.py
+++ b/tests/vm/basevm.py
@@ -353,23 +353,23 @@ class BaseVM(object):
"local-hostname: {}-guest\n".format(name)])
mdata.close()
udata = open(os.path.join(cidir, "user-data"), "w")
- print("guest user:pw {}:{}".format(self._config['guest_user'],
- self._config['guest_pass']))
+ print("guest user:pw {}:{}".format(self.GUEST_USER,
+ self.GUEST_PASS))
udata.writelines(["#cloud-config\n",
"chpasswd:\n",
" list: |\n",
- " root:%s\n" % self._config['root_pass'],
- " %s:%s\n" % (self._config['guest_user'],
- self._config['guest_pass']),
+ " root:%s\n" % self.ROOT_PASS,
+ " %s:%s\n" % (self.GUEST_USER,
+ self.GUEST_PASS),
" expire: False\n",
"users:\n",
- " - name: %s\n" % self._config['guest_user'],
+ " - name: %s\n" % self.GUEST_USER,
" sudo: ALL=(ALL) NOPASSWD:ALL\n",
" ssh-authorized-keys:\n",
- " - %s\n" % self._config['ssh_pub_key'],
+ " - %s\n" % SSH_PUB_KEY.rstrip(),
" - name: root\n",
" ssh-authorized-keys:\n",
- " - %s\n" % self._config['ssh_pub_key'],
+ " - %s\n" % SSH_PUB_KEY.rstrip(),
"locale: en_US.UTF-8\n"])
proxy = os.environ.get("http_proxy")
if not proxy is None:
--
2.17.1
- [PATCH v4 00/10] tests/vm: Add support for aarch64 VMs, Robert Foley, 2020/03/12
- [PATCH v4 01/10] tests/vm: Fix issues in gen_cloud_init_iso,
Robert Foley <=
- [PATCH v4 02/10] tests/vm: Add configuration to basevm.py, Robert Foley, 2020/03/12
- [PATCH v4 03/10] tests/vm: Added configuration file support, Robert Foley, 2020/03/12
- [PATCH v4 04/10] tests/vm: add --boot-console switch, Robert Foley, 2020/03/12
- [PATCH v4 05/10] tests/vm: Add ability to select QEMU from current build., Robert Foley, 2020/03/12
- [PATCH v4 07/10] tests/vm: Added a new script for ubuntu.aarch64., Robert Foley, 2020/03/12
- [PATCH v4 08/10] tests/vm: Added a new script for centos.aarch64., Robert Foley, 2020/03/12
- [PATCH v4 06/10] tests/vm: allow wait_ssh() to specify command, Robert Foley, 2020/03/12
- [PATCH v4 09/10] tests/vm: change scripts to use self._config, Robert Foley, 2020/03/12
- [PATCH v4 10/10] tests/vm: Add workaround to consume console, Robert Foley, 2020/03/12