Bug 1389742

Summary:	build: incorrect Requires: for portblock resource agent
Product:	[Community] GlusterFS	Reporter:	Kaleb KEITHLEY <kkeithle>
Component:	build	Assignee:	Kaleb KEITHLEY <kkeithle>
Status:	CLOSED CURRENTRELEASE	QA Contact:
Severity:	unspecified	Docs Contact:
Priority:	unspecified
Version:	3.9	CC:	bugs, skoduri
Target Milestone:	---	Keywords:	Triaged
Target Release:	---
Hardware:	Unspecified
OS:	Unspecified
Whiteboard:
Fixed In Version:		Doc Type:	If docs needed, set a value
Doc Text:		Story Points:	---
Clone Of:	1389293	Environment:
Last Closed:	2016-12-06 05:06:27 UTC	Type:	Bug
Regression:	---	Mount Type:	---
Documentation:	---	CRM:
Verified Versions:		Category:	---
oVirt Team:	---	RHEL 7.3 requirements from Atomic Host:
Cloudforms Team:	---	Target Upstream Version:
Embargoed:
Bug Depends On:	1389293
Bug Blocks:	1350744

Description Kaleb KEITHLEY 2016-10-28 12:07:00 UTC

+++ This bug was initially created as a clone of Bug #1389293 +++

Description of problem:

email from buildsys warns that 
  	glusterfs-ganesha-3.9.0-0.1.rc2.fc26 requires /usr/lib/ocf/resource.d/portblock

glusterfs.spec(.in) has: 

  Requires:         %{_prefix}/lib/ocf/resource.d/portblock

should be:

  Requires:         %{_prefix}/lib/ocf/resource.d/heartbeat/portblock

and would probably be better as:

  Requires:       resource-agents (>= 3.9.6)

Fedora 23 has version 3.9.6 with portblock. RHEL7.2 has version 3.9.5 and no portblock.

Version-Release number of selected component (if applicable):


How reproducible:


Steps to Reproduce:
1.
2.
3.

Actual results:


Expected results:


Additional info:

--- Additional comment from Worker Ant on 2016-10-27 08:10:04 EDT ---

REVIEW: http://review.gluster.org/15743 (build: incorrect Requires for portblock resource agent) posted (#1) for review on master by Kaleb KEITHLEY (kkeithle)

Comment 1 Worker Ant 2016-10-28 13:02:05 UTC

REVIEW: http://review.gluster.org/15754 (build: incorrect Requires for portblock resource agent) posted (#1) for review on release-3.9 by Kaleb KEITHLEY (kkeithle)

Comment 2 Worker Ant 2016-11-04 10:10:12 UTC

COMMIT: http://review.gluster.org/15754 committed in release-3.9 by Kaleb KEITHLEY (kkeithle) 
------
commit bbeb83f5c431151d095336d49908aeb3b11d28d2
Author: Kaleb S. KEITHLEY <kkeithle>
Date:   Fri Oct 28 08:59:04 2016 -0400

    build: incorrect Requires for portblock resource agent
    
    was:
      Requires: /usr/lib/ocf/resource.d/portblock
    s/b:
      Requires: /usr/lib/ocf/resource.d/heartbeat/portblock
    or:
      Requires: resource-agents >= 3.9.6
    
    Note: RHEL6.8 and RHEL7.2 have resource-agents-3.9.5 which does
    not contain the portblock resource agent.
    
    I'm not sure what the point is actually of:
    
      Requires: /usr/lib/ocf/resource.d/heartbeat/portblock
    
    as it will fail to install on RHEL whether you have the
    resource-agents package installed or not. Hence wrapping
    it in %if ( fedora ).
    
    Change-Id: Ia7d6a475464c7469018678c98fc710a3b3bfc553
    BUG: 1389742
    Signed-off-by: Kaleb S. KEITHLEY <kkeithle>
    Reviewed-on: http://review.gluster.org/15754
    Smoke: Gluster Build System <jenkins.org>
    NetBSD-regression: NetBSD Build System <jenkins.org>
    CentOS-regression: Gluster Build System <jenkins.org>

Comment 3 Worker Ant 2016-11-09 06:22:01 UTC

REVIEW: http://review.gluster.org/15807 (build: Update version check for resource-agents on RHEL) posted (#1) for review on release-3.9 by soumya k (skoduri)

Comment 4 Worker Ant 2016-11-09 18:19:14 UTC

COMMIT: http://review.gluster.org/15807 committed in release-3.9 by Kaleb KEITHLEY (kkeithle) 
------
commit 2c120529ec712da785e19397094153a02fcd2d89
Author: Kaleb KEITHLEY <kkeithle>
Date:   Tue Nov 8 15:08:37 2016 +0530

    build: Update version check for resource-agents on RHEL
    
    With bug1302545[1] and bug1303037[2], portblock resource agent
    is made available as part of resource-agents-3.9.5* package
    on RHEL 6.8 and RHEL 7.3 respectively. This change is to
    update the same in the glusterfs spec.
    
    [1] https://bugzilla.redhat.com/show_bug.cgi?id=1302545
    [2] https://bugzilla.redhat.com/show_bug.cgi?id=1303037
    
    This is backport of below mainline patch -
      http://review.gluster.org/15803
    
    
    > Change-Id: I5917e5f22f07b4121d636b099dd8815847e1338f
    > BUG: 1389742
    > Author:    Kaleb KEITHLEY <kkeithle>
    > Signed-off-by: Soumya Koduri <skoduri>
    > Reviewed-on: http://review.gluster.org/15803
    > Reviewed-by: Kaleb KEITHLEY <kkeithle>
    > Reviewed-by: jiffin tony Thottan <jthottan>
    > NetBSD-regression: NetBSD Build System <jenkins.org>
    > Smoke: Gluster Build System <jenkins.org>
    > CentOS-regression: Gluster Build System <jenkins.org>
    > (cherry picked from commit 3e980c5eff495725e7c01793451bc81fd6f94ad5)
    
    Change-Id: Ib7a3194f0581f131a537a7b543f396b4837bffbf
    BUG: 1389742
    Signed-off-by: Soumya Koduri <skoduri>
    Reviewed-on: http://review.gluster.org/15807
    NetBSD-regression: NetBSD Build System <jenkins.org>
    Reviewed-by: Kaleb KEITHLEY <kkeithle>
    CentOS-regression: Gluster Build System <jenkins.org>
    Smoke: Gluster Build System <jenkins.org>