External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-01-22 04:25:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Move Clear Linux cloud-init files to subdirectory

Browse Source 
And rename the default user from "admin" to "cloud" as the admin user
clashes with a standard user and group name on Ubuntu.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2019-07-30 11:46:13 +01:00 committed by Samuel Ortiz
parent 98d7955e34
commit be199e5560
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.rs
View File

@ -263,7 +263,12 @@ mod tests {
let cloudinit_file_path = let cloudinit_file_path =
String::from(self.tmp_dir.path().join("cloudinit").to_str().unwrap()); String::from(self.tmp_dir.path().join("cloudinit").to_str().unwrap());
let cloud_init_directory = self.tmp_dir.path().join("cloud-init").join("openstack"); let cloud_init_directory = self
.tmp_dir
.path()
.join("cloud-init")
.join("clear")
.join("openstack");
fs::create_dir_all(&cloud_init_directory.join("latest")) fs::create_dir_all(&cloud_init_directory.join("latest"))
.expect("Expect creating cloud-init directory to succeed"); .expect("Expect creating cloud-init directory to succeed");
@ -272,6 +277,7 @@ mod tests {
.unwrap() .unwrap()
.join("test_data") .join("test_data")
.join("cloud-init") .join("cloud-init")
.join("clear")
.join("openstack") .join("openstack")
.join("latest"); .join("latest");
@ -370,7 +376,7 @@ mod tests {
let mut sess = Session::new().unwrap(); let mut sess = Session::new().unwrap();
sess.handshake(&tcp).map_err(|_| Error::Connection)?; sess.handshake(&tcp).map_err(|_| Error::Connection)?;
sess.userauth_password("admin", "cloud123") sess.userauth_password("cloud", "cloud123")
.map_err(|_| Error::Authentication)?; .map_err(|_| Error::Authentication)?;
assert!(sess.authenticated()); assert!(sess.authenticated());

0
test_data/cloud-init/openstack/latest/meta_data.json → test_data/cloud-init/clear/openstack/latest/meta_data.json
View File

2
test_data/cloud-init/openstack/latest/user_data → test_data/cloud-init/clear/openstack/latest/user_data
View File

@ -1,6 +1,6 @@
#cloud-config #cloud-config
users: users:
- name: admin - name: cloud
passwd: $6$7125787751a8d18a$sHwGySomUA1PawiNFWVCKYQN.Ec.Wzz0JtPPL1MvzFrkwmop2dq7.4CYf03A5oemPQ4pOFCCrtCelvFBEle/K. passwd: $6$7125787751a8d18a$sHwGySomUA1PawiNFWVCKYQN.Ec.Wzz0JtPPL1MvzFrkwmop2dq7.4CYf03A5oemPQ4pOFCCrtCelvFBEle/K.
sudo: sudo:
- ALL=(ALL) NOPASSWD:ALL - ALL=(ALL) NOPASSWD:ALL