Change in vdsm[master]: configurator: use sanlock user constant

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has uploaded a new change for review.

Change subject: configurator: use sanlock user constant
......................................................................

configurator: use sanlock user constant

Replace the static value with a constant.

Change-Id: I43464961cba6b6b761a98ad4b72a271228914ca1
Signed-off-by: Douglas Schilling Landgraf 
---
M lib/vdsm/constants.py.in
M lib/vdsm/tool/configurator.py
2 files changed, 6 insertions(+), 2 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/80/26080/1

diff --git a/lib/vdsm/constants.py.in b/lib/vdsm/constants.py.in
index 6653d54..4ddfe84 100644
--- a/lib/vdsm/constants.py.in
+++ b/lib/vdsm/constants.py.in
@@ -41,6 +41,9 @@
 QEMU_PROCESS_USER = '@QEMUUSER@'
 QEMU_PROCESS_GROUP = '@QEMUGROUP@'

+# Sanlock definitions
+SANLOCK_USER = '@SNLKUSER@'
+
 #
 # The username of SASL authenticating for libvirt connection
 #
diff --git a/lib/vdsm/tool/configurator.py b/lib/vdsm/tool/configurator.py
index d1c876c..896aa25 100644
--- a/lib/vdsm/tool/configurator.py
+++ b/lib/vdsm/tool/configurator.py
@@ -24,7 +24,8 @@

from .. import utils
 from . import service, expose
-from ..constants import P_VDSM_EXEC, QEMU_PROCESS_GROUP, VDSM_GROUP
+from ..constants import P_VDSM_EXEC, QEMU_PROCESS_GROUP, \
+        SANLOCK_USER, VDSM_GROUP

class _ModuleConfigure(object):
@@ -132,7 +133,7 @@
                 '-a',
                 '-G',
                 ','.join(self.SANLOCK_GROUPS),
-                'sanlock'
+                SANLOCK_USER
             ),
             raw=True,
         )

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: configurator: use sanlock user constant
......................................................................

Patch Set 1: Code-Review-1 Verified-1

Build Failed

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6836/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/7626/ : UNSTABLE

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7736/ : FAILURE

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: configurator: use sanlock user constant
......................................................................

Patch Set 2:

Build Successful

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6838/ : SUCCESS

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

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7738/ : SUCCESS

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: configurator: use sanlock user constant
......................................................................

Patch Set 3:

Build Failed

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6840/ : FAILURE

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

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7740/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/407/ : FAILURE

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: configurator: use sanlock user constant
......................................................................

Patch Set 4:

Build Successful

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/6841/ : SUCCESS

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

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/7741/ : SUCCESS

Yaniv Bronhaim has posted comments on this change.

Change subject: configurator: use sanlock user constant
......................................................................

Patch Set 4: Code-Review+1

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: configurator: use sanlock user constant
......................................................................

Patch Set 4: Verified+1

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: configurator: use sanlock user constant
......................................................................

Patch Set 4:

Test: generated a iso with this change and after install I see the sanlock user into /etc/group

Yaniv Bronhaim has posted comments on this change.

Change subject: configurator: use sanlock user constant
......................................................................

Patch Set 4:

please check if it possible to rebase it over http://gerrit.ovirt.org/#/c/25263/ (which will be merge really soon) and add one unit test for that. i know i haven't done it till now, but maybe you'll come up with nice trick for checking the ownership changes .

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: configurator: use sanlock user constant
......................................................................

Patch Set 4:

A test for move a static value for constant? I don't get it.

Yaniv Bronhaim has posted comments on this change.

Change subject: configurator: use sanlock user constant
......................................................................

Patch Set 4:

i gave it +1. i just wanted more of this patch to also test this sanlock configure class.. maybe later if you prefer to merge this change first

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: configurator: use sanlock user constant
......................................................................

Patch Set 4:

Ah I got. Yes, I would prefer small and separate steps.

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: configurator: use sanlock user constant
......................................................................

Patch Set 4: Code-Review+2

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: configurator: use sanlock user constant
......................................................................

configurator: use sanlock user constant

Replace the static value with a constant.

Change-Id: I43464961cba6b6b761a98ad4b72a271228914ca1
Signed-off-by: Douglas Schilling Landgraf 
Reviewed-on: http://gerrit.ovirt.org/26080
Reviewed-by: Yaniv Bronhaim 
Reviewed-by: Dan Kenigsberg 
---
M lib/vdsm/constants.py.in
M lib/vdsm/tool/configurator.py
2 files changed, 6 insertions(+), 2 deletions(-)

Approvals:
  Douglas Schilling Landgraf: Verified
  Yaniv Bronhaim: Looks good to me, but someone else must approve
  Dan Kenigsberg: Looks good to me, approved