Change in vdsm[master]: Revert Ib7808f4f217ba3d6d30a60fab6233e36a29f0098 and add set...

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(a)redhat.com&gt;
Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibfc751aaa79f8d6374efec8d6c594ba7a1ad5607
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

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(a)redhat.com&gt;
Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Change-Id: Ibfc751aaa79f8d6374efec8d6c594ba7a1ad5607
Reviewed-on: http://gerrit.ovirt.org/35763
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com&gt;
Tested-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M init/vdsmd_init_common.sh.in
M vdsm.spec.in
2 files changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Dan Kenigsberg: Verified; Looks good to me, approved



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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibfc751aaa79f8d6374efec8d6c594ba7a1ad5607
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

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


Patch Set 1: Verified+1

The reverted patch causes failure on clean install.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ibfc751aaa79f8d6374efec8d6c594ba7a1ad5607
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

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


Patch Set 2:

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master-libfapi_create-rpms-el6-x86_64_m... :
SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc21-x86_64_merged/252/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master-libfapi_create-rpms-fc20-x86_64_... :
FAILURE

http://jenkins.ovirt.org/job/vdsm_master_create-rpms_merged_test_debug/469/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master-libfapi_create-rpms-el7-x86_64_m... :
SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc20-x86_64_merged/267/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_merged/4261/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_create-rpms-el6-x86_64_merged/274/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_create-rpms-el7-x86_64_merged/276/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master-libfapi_create-rpms-fc21-x86_64_... :
SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_verify-error-codes_merged/6099/ : SUCCESS

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ibfc751aaa79f8d6374efec8d6c594ba7a1ad5607
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

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


Patch Set 2:

(1 comment)

http://gerrit.ovirt.org/#/c/35763/2/vdsm.spec.in
File vdsm.spec.in:

Line 788: %post
Line 789: %{_bindir}/vdsm-tool configure --module sanlock --force >/dev/null
Line 790: # update the vdsm "secret" password for libvirt
Line 791: if [ -f /etc/pki/vdsm/keys/libvirt_password ]; then
Line 792:     @SASLPASSWD2_PATH@ -p -a libvirt vdsm@ovirt < \
I missed the fact that this is not a pure revert. That's unfortunate as you should
have used SASL_USERNAME here (for cleanliness; no functional harm's done).
Line 793:             /etc/pki/vdsm/keys/libvirt_password
Line 794: fi
Line 795: 
Line 796: # After vdsm install we should create the logs files.


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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ibfc751aaa79f8d6374efec8d6c594ba7a1ad5607
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

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


Patch Set 1:

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-fc21_created/... : ABORTED

http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-el6_created/688/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/13816/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-fc20_created/... : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/13027/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/13979/ : ABORTED

http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-el7_created/127/ : SUCCESS

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ibfc751aaa79f8d6374efec8d6c594ba7a1ad5607
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

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


Patch Set 1: Code-Review+2

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ibfc751aaa79f8d6374efec8d6c594ba7a1ad5607
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No