commit c3ff7257793599ebc94306e0e4568eafec2ed7b9
Author: Radek Novacek <rnovacek(a)redhat.com>
Date: Tue Aug 27 15:47:33 2013 +0200
Require username to be present
Username is now required because new hypervisor may appear anytime
virt-who.py | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/virt-who.py b/virt-who.py
index 36c2f90..88b8e37 100644
--- a/virt-who.py
+++ b/virt-who.py
@@ -444,14 +444,10 @@ def main():
if options.smType == "satellite":
options.sat_server = checkEnv("VIRTWHO_SATELLITE_SERVER",
options.sat_server, "satellite-server")
- if len(options.sat_username) == 0:
- options.sat_username = os.getenv("VIRTWHO_SATELLITE_USERNAME",
"")
+ options.sat_username = checkEnv("VIRTWHO_SATELLITE_USERNAME",
options.sat_username, "satellite-username")
if len(options.sat_password) == 0:
options.sat_password = os.getenv("VIRTWHO_SATELLITE_PASSWORD",
"")
- if len(options.sat_username) == 0:
- logger.info('Satellite username is not specified, assuming preregistered
system')
-
if options.virtType == "esx":
options.owner = checkEnv("VIRTWHO_ESX_OWNER", options.owner,
"owner")
options.env = checkEnv("VIRTWHO_ESX_ENV", options.env,
"env")
Show replies by date