x/cloudbase-init
Code Issues Proposed changes

formatting

Browse Source 
Change-Id: I8ac47450ebec2d5cd1b8451dbed763419871b84b
This commit is contained in:
Fabian Schuetz 2023-06-23 08:34:33 +02:00
parent 7731d0d86f
commit dd26596bfe
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cloudbaseinit/metadata/services/osconfigdrive/windows.py
View File

@ -221,7 +221,8 @@ class WindowsConfigDriveManager(base.BaseConfigDriveManager):
return get_config_drive(drive_label, metadata_file) return get_config_drive(drive_label, metadata_file)
else: else:
LOG.info("Irrelevant type %(type)s in %(location)s " LOG.info("Irrelevant type %(type)s in %(location)s "
"location; skip", {"type": cd_type, "location": cd_location}) "location; skip", {"type": cd_type,
"location": cd_location})
except Exception as exc: except Exception as exc:
LOG.warning("Config type %(type)s not found in %(loc)s " LOG.warning("Config type %(type)s not found in %(loc)s "
"location; Error: '%(err)r'", "location; Error: '%(err)r'",

5
cloudbaseinit/osutils/windows.py
View File

@ -1481,8 +1481,9 @@ class WindowsUtils(base.BaseOSUtils):
return struct.calcsize("P") == 8 return struct.calcsize("P") == 8
def _has_cdfs(self, drive): def _has_cdfs(self, drive):
(out, err, exit_code) = self.execute_powershell_command("wmic " (out, err, exit_code) =
"logicaldisk get deviceid,filesystem") self.execute_powershell_command("wmic logicaldisk "
"get deviceid,filesystem")
LOG.info("Checking if drive %s has CDFS filesystem" % drive) LOG.info("Checking if drive %s has CDFS filesystem" % drive)
if exit_code == 0: if exit_code == 0:
lines = out.decode('ascii').replace('\r\r', '').splitlines()[1:] lines = out.decode('ascii').replace('\r\r', '').splitlines()[1:]