Dan Kenigsberg has uploaded a new change for review.

Change subject: vdscli: no need to generate using autoconf
......................................................................

vdscli: no need to generate using autoconf

.in files are cumbersome and non-pythonic. As such, they should be
avoided when possible. The only autoconf-related value in vdscli was the
default value for the trust store. This value is already available from
config.py, which is still auto-confingured.

Change-Id: I13059d101068cf6fa292baae4fb93ccf0b30db45
Signed-off-by: Dan Kenigsberg <[email protected]>
---
M lib/vdsm/Makefile.am
R lib/vdsm/vdscli.py
2 files changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/76/28676/1

diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am
index 24f7151..7747dc4 100644
--- a/lib/vdsm/Makefile.am
+++ b/lib/vdsm/Makefile.am
@@ -36,12 +36,12 @@
        SecureXMLRPCServer.py \
        sslutils.py \
        utils.py \
+       vdscli.py \
        $(NULL)
 
 nodist_vdsmpylib_PYTHON = \
        config.py \
        constants.py \
-       vdscli.py \
        $(NULL)
 
 nodist_noinst_DATA= \
@@ -57,7 +57,6 @@
 EXTRA_DIST = \
        config.py.in \
        constants.py.in \
-       vdscli.py.in \
        vdsm.conf.sample \
        $(NULL)
 
diff --git a/lib/vdsm/vdscli.py.in b/lib/vdsm/vdscli.py
similarity index 98%
rename from lib/vdsm/vdscli.py.in
rename to lib/vdsm/vdscli.py
index ef3e71e..e4e042f 100644
--- a/lib/vdsm/vdscli.py.in
+++ b/lib/vdsm/vdscli.py
@@ -28,7 +28,7 @@
 
 
 d_useSSL = False
-d_tsPath = '@TRUSTSTORE@'
+d_tsPath = '/etc/pki/vdsm'
 d_addr = '0'
 d_port = '54321'
 


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I13059d101068cf6fa292baae4fb93ccf0b30db45
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <[email protected]>
_______________________________________________
vdsm-patches mailing list
[email protected]
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Reply via email to