Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build/ops: RPM: move runtime dependencies to ceph-base and fix other packaging issues #7826

Merged
merged 8 commits into from Feb 29, 2016

Conversation

smithfarm
Copy link
Contributor

This PR aggregates a number of packaging fixes. Hopefully this will ease the load on the gitbuilders.

@smithfarm smithfarm added this to the jewel milestone Feb 26, 2016
@smithfarm smithfarm force-pushed the wip-move-requires branch 2 times, most recently from 0ddff54 to f1e2487 Compare February 26, 2016 21:39
The ceph package is now a metapackage, so move all its runtime dependencies
to ceph-base as we already have done in the Debian packaging.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
Flask is used by MON (in the Ceph REST API) and by RGW (powerdns).
Therefore, it only needs to be in the ceph-mon and ceph-radosgw packages.

Also, this commit encloses the specification of the python-flask runtime
dependency in distro-conditional blocks to account for a minor difference
in the package name between RHEL and SUSE.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
In Jewel, there is no reason to support anything less than openSUSE 13.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
ceph-disk uses sgdisk, which resides in the gdisk and gptfdisk packages on
RHEL and SUSE derivatives, respectively.

ceph-disk is included in the ceph-osd package, so the sgdisk dependency
belongs there.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
ceph-detect-init uses pkg_resources.py

http://tracker.ceph.com/issues/14864 Fixes: ceph#14864

Signed-off-by: Nathan Cutler <ncutler@suse.com>
@smithfarm
Copy link
Contributor Author

Pushed to gitbuilders.

@smithfarm
Copy link
Contributor Author

This PR passes the deb+rpm amd64 gitbuilders.

@smithfarm smithfarm changed the title RPM: align runtime dependencies with Debian packaging RPM: move runtime dependencies to ceph-base and fix other packaging issues Feb 28, 2016
@smithfarm
Copy link
Contributor Author

However, OBS says:

[ 5133s] found conflict of ceph-base-10.0.3+git.1456694378.081fbf0-1.1.x86_64 with ceph-osd-10.0.3+git.1456694378.081fbf0-1.1.x86_64:
[ 5133s]   - /usr/lib/udev/rules.d/60-ceph-partuuid-workaround.rules
[ 5133s]   - /usr/lib/udev/rules.d/95-ceph-osd.rules
[ 5133s]   - /usr/lib64/rados-classes/libcls_hello.so
[ 5133s]   - /usr/lib64/rados-classes/libcls_kvs.so
[ 5133s]   - /usr/lib64/rados-classes/libcls_lock.so
[ 5133s]   - /usr/lib64/rados-classes/libcls_log.so
[ 5133s]   - /usr/lib64/rados-classes/libcls_rbd.so
[ 5133s]   - /usr/lib64/rados-classes/libcls_refcount.so
[ 5133s]   - /usr/lib64/rados-classes/libcls_replica_log.so
[ 5133s]   - /usr/lib64/rados-classes/libcls_rgw.so
[ 5133s]   - /usr/lib64/rados-classes/libcls_statelog.so
[ 5133s]   - /usr/lib64/rados-classes/libcls_user.so
[ 5133s]   - /usr/lib64/rados-classes/libcls_version.so

@smithfarm
Copy link
Contributor Author

Now we are getting:

[ 5056s] RPM build errors:
[ 5056s]     File listed twice: /var/lib/ceph/mds
[ 5056s]     File listed twice: /var/lib/ceph/mon
[ 5056s]     File listed twice: /var/lib/ceph/osd
[ 5056s]     Installed (but unpackaged) file(s) found:
[ 5056s]    /usr/lib64/rados-classes/libcls_cephfs.so
[ 5056s]    /usr/lib64/rados-classes/libcls_journal.so
[ 5056s]    /usr/lib64/rados-classes/libcls_numops.so
[ 5056s]    /usr/lib64/rados-classes/libcls_timeindex.so

@ktdreyer
Copy link
Member

  • Those rados-classes libraries should be added into ceph-base (and the duplicate rados-classes entries removed from ceph-osd).
  • Those two udev rules should be in ceph-osd (and the duplicate entries removed from ceph-base).
  • The /var/lib/ceph/* directories are each listed twice, once with an %attr, and once without. The entries without %attr should be removed.

Drop duplicate rados-classes libraries from ceph-osd and align the RPM
packaging with Debian by using a wildcard to package everything that
autotools puts in the rados-classes directory.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
The udev rules should be packaged in ceph-osd only.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
As of a recent commit, we had /var/lib/ceph/{mds,mon,osd} directories
packaged twice, once with %attr and once without. Drop the latter.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
@smithfarm
Copy link
Contributor Author

@ktdreyer How does this look? (Testing now in OBS)

@ktdreyer
Copy link
Member

Looks right to me. Thanks. If it passes gitbuilder, we can merge

@smithfarm
Copy link
Contributor Author

Pushed latest version to gitbuilders.

@smithfarm
Copy link
Contributor Author

@ktdreyer: It passes the RPM gitbuilders. I can't make out whether it passed the deb ones or not - can you?

@ktdreyer
Copy link
Member

@ktdreyer ktdreyer merged commit 4de86bf into ceph:jewel Feb 29, 2016
ktdreyer added a commit that referenced this pull request Feb 29, 2016
RPM: move runtime dependencies to ceph-base and fix other packaging issues

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
@smithfarm smithfarm deleted the wip-move-requires branch February 29, 2016 23:31
@ghost ghost changed the title RPM: move runtime dependencies to ceph-base and fix other packaging issues build/ops: RPM: move runtime dependencies to ceph-base and fix other packaging issues Mar 8, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants