Change in vdsm[master]: Revert "Fixing ssl config validation"

[Federico Simoncelli]

Federico Simoncelli has uploaded a new change for review.

Change subject: Revert "Fixing ssl config validation"
......................................................................

Revert "Fixing ssl config validation"

This reverts commit cff03f968e882d94808cf272d9cc3e2ac29fabd0.

Setting ssl=false in vdsm.conf makes impossible to start the vdsmd
service:

FAILED: conflicting vdsm and libvirt-qemu tls configuration.
 vdsm.conf with ssl=False requires the following changed:
 libvirtd.conf: listen_tcp=1, auth_tcp="none",
 qemu.conf: spice_tls=0.

Also running:

# vdsm-tool configure --force

is not resolving the situation.

Change-Id: Ic4cab6f3346f9b1ad492d40ea3d3c645484570da
Signed-off-by: Federico Simoncelli 
---
M lib/vdsm/tool/libvirt_configure.sh.in
1 file changed, 15 insertions(+), 32 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/92/24492/1

diff --git a/lib/vdsm/tool/libvirt_configure.sh.in b/lib/vdsm/tool/libvirt_configure.sh.in
index f1b70bd..8a70be5 100755
--- a/lib/vdsm/tool/libvirt_configure.sh.in
+++ b/lib/vdsm/tool/libvirt_configure.sh.in
@@ -47,16 +47,11 @@
 get_libvirt_conf_item() {
     local cfile="$1"
     local key="$2"
-    @GREP_PATH@ "^\s*"${key}"\s*=" "${cfile}" >/dev/null 2>&1 | \
+    @GREP_PATH@ "^\s*"${key}"\s*=" "${cfile}" | \
             tail -1 | @SED_PATH@ "s/\s*$key\s*=\s*//;s/\s*(#.*)?$//"
 }

test_conflicting_conf() {
-    test_ssl_conflict_conf
-    # add here additional conf checks
-}
-
-test_ssl_conflict_conf() {
     local lconf="$1"
     local qconf="$2"

@@ -66,38 +61,26 @@
         return 3
     fi

+    if [ "${ssl}" = "true" ]; then
+        echo "SUCCESS: ssl configured to true. No conflicts"
+        return 0
+    fi
+
     local listen_tcp="$(get_libvirt_conf_item "${lconf}" listen_tcp)"
     local auth_tcp="$(get_libvirt_conf_item "${lconf}" auth_tcp)"
     local spice_tls="$(get_libvirt_conf_item "${qconf}" spice_tls)"

-    if [ "${ssl}" = "true" ]; then
-        if [ "${listen_tcp}" != "1" -a \
-             "${auth_tcp}" != '"none"' -a \
-             "${spice_tls}" != "0" ]; then
-            echo "SUCCESS: ssl configured to true. No conflicts"
-            return 0
-        else
-            echo "FAILED: conflicting vdsm and libvirt-qemu tls configuration."
-            echo "vdsm.conf with ssl=True requires the following changed: "
-            echo "libvirtd.conf: listen_tcp=0, auth_tcp="sasl", "
-            echo "qemu.conf: spice_tls=1."
-            return 1
-        fi
-
+    if [ "${listen_tcp}" = "1" -a \
+         "${auth_tcp}" = '"none"' -a \
+         "${spice_tls}" = "0" ]; then
+        echo "SUCCESS: No conflicts between configuration files"
         return 0
     else
-        if [ "${listen_tcp}" = "1" -a \
-             "${auth_tcp}" = '"none"' -a \
-             "${spice_tls}" = "0" ]; then
-            echo "SUCCESS: ssl configured to false. No conflicts."
-            return 0
-        else
-            echo "FAILED: conflicting vdsm and libvirt-qemu tls configuration."
-            echo "vdsm.conf with ssl=False requires the following changed: "
-            echo "libvirtd.conf: listen_tcp=1, auth_tcp="none", "
-            echo "qemu.conf: spice_tls=0."
-            return 1
-        fi
+        echo "FAILED: conflicting vdsm and libvirt-qemu tls configuration."
+        echo "vdsm.conf with ssl=False requires the following changed: "
+        echo "libvirtd.conf: listen_tcp=1, auth_tcp="none", "
+        echo "qemu.conf: spice_tls=0."
+        return 1
     fi
 }