Yaniv Bronhaim has uploaded a new change for review.

Change subject: Revert Ib7808f4f217ba3d6d30a60fab6233e36a29f0098 and add set-sasl to spec ......................................................................

Revert Ib7808f4f217ba3d6d30a60fab6233e36a29f0098 and add set-sasl to spec

To avoid upgrade issue and set the sasl password during installation, this workaround change the use in vdsm-tool to direct call.

Bug-Url : https://bugzilla.redhat.com/show_bug.cgi?id=1168689 Signed-off-by: Yaniv Bronhaim ybronhei@redhat.com Signed-off-by: Yaniv Bronhaim ybronhei@redhat.com Change-Id: Ibfc751aaa79f8d6374efec8d6c594ba7a1ad5607 --- M init/vdsmd_init_common.sh.in M vdsm.spec.in 2 files changed, 5 insertions(+), 5 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/63/35763/1

diff --git a/init/vdsmd_init_common.sh.in b/init/vdsmd_init_common.sh.in index 9389e28..e637b59 100644 --- a/init/vdsmd_init_common.sh.in +++ b/init/vdsmd_init_common.sh.in @@ -216,10 +216,6 @@ [ "${ret}" -eq 0 ] && rm -f "${upgraded_ver_file}" fi } - -task_set_sasl_password() { - "$VDSM_TOOL" set-saslpasswd -} #### pre-start tasks end ####

@@ -256,7 +252,6 @@ # after load_needed_modules (modprobe bonding). # NetworkManager must not crash on nmcli conn delete. run_tasks " \ - set_sasl_password \ mkdirs \ configure_coredump \ configure_vdsm_logs \ diff --git a/vdsm.spec.in b/vdsm.spec.in index 7dfaece..7f878c2 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -787,6 +787,11 @@

%post %{_bindir}/vdsm-tool configure --module sanlock --force >/dev/null +# update the vdsm "secret" password for libvirt +if [ -f /etc/pki/vdsm/keys/libvirt_password ]; then + @SASLPASSWD2_PATH@ -p -a libvirt vdsm@ovirt < \ + /etc/pki/vdsm/keys/libvirt_password +fi

# After vdsm install we should create the logs files. # In the install session we create it but since we use