Change in vdsm[master]: vdscli: drop Windows support

danken at redhat.com danken at redhat.com
Thu Jun 12 16:48:22 UTC 2014


Dan Kenigsberg has uploaded a new change for review.

Change subject: vdscli: drop Windows support
......................................................................

vdscli: drop Windows support

In prehistorical ages, Engine used to run on Windows, and vdsClient
could be installed there. This is no longer the case, and there is no
reason to carry this baggage any longer.

Change-Id: I9081fea11d7e7e8b48c32cb3babbb5070f2e04e0
Signed-off-by: Dan Kenigsberg <danken at redhat.com>
---
M lib/vdsm/vdscli.py.in
1 file changed, 3 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/75/28675/1

diff --git a/lib/vdsm/vdscli.py.in b/lib/vdsm/vdscli.py.in
index 6eea32c..ef3e71e 100644
--- a/lib/vdsm/vdscli.py.in
+++ b/lib/vdsm/vdscli.py.in
@@ -72,15 +72,6 @@
             d_addr = config.get('addresses', 'management_ip')
         except:
             pass
-        if os.name == 'nt':
-            def getRHEVMInstallPath():
-                import _winreg
-                key_path = 'SOFTWARE\\RedHat\\RHEVM Service'
-                root = _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, key_path)
-                val, v_type = _winreg.QueryValueEx(root, "Location")
-                retval = os.path.dirname(os.path.dirname(val))
-                return str(retval)
-            d_tsPath = os.path.join(getRHEVMInstallPath(), "Service", "ca")
     except:
         pass
 
@@ -108,14 +99,9 @@
     if tsPath is None:
         tsPath = d_tsPath
     if useSSL:
-        if os.name == 'nt':
-            KEYFILE = tsPath + '\\keys\\rhevm.pem'
-            CERTFILE = tsPath + '\\certs\\rhevm.cer'
-            CACERT = tsPath + '\\certs\\ca.pem'
-        else:
-            KEYFILE = tsPath + '/keys/vdsmkey.pem'
-            CERTFILE = tsPath + '/certs/vdsmcert.pem'
-            CACERT = tsPath + '/certs/cacert.pem'
+        KEYFILE = tsPath + '/keys/vdsmkey.pem'
+        CERTFILE = tsPath + '/certs/vdsmcert.pem'
+        CACERT = tsPath + '/certs/cacert.pem'
 
         for f in (KEYFILE, CERTFILE, CACERT):
             if not os.access(f, os.R_OK):


-- 
To view, visit http://gerrit.ovirt.org/28675
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9081fea11d7e7e8b48c32cb3babbb5070f2e04e0
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken at redhat.com>


More information about the vdsm-patches mailing list