Skip to content

Commit

Permalink
build/ops: deb: add python dependencies where needed
Browse files Browse the repository at this point in the history
The post-split daemon packages (ceph-mon, ceph-mds, ceph-osd, etc.) have
"ceph-base" as a dependency and ceph-base has "${python:Depends}" but this
macro only gets expanded for ceph-base.

As a result, the "ceph" CLI tool is broken when only "ceph-mon" is installed.

Fixes: http://tracker.ceph.com/issues/17579

Signed-off-by: Nathan Cutler <ncutler@suse.com>
  • Loading branch information
smithfarm committed Oct 15, 2016
1 parent 46fbb70 commit b400c15
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ Package: ceph-mds
Architecture: linux-any
Depends: ceph-base (= ${binary:Version}),
${misc:Depends},
${python:Depends},
${shlibs:Depends}
Recommends: ceph-fuse (= ${binary:Version}),
libcephfs1 (= ${binary:Version})
Expand Down Expand Up @@ -148,6 +149,7 @@ Package: ceph-mgr
Architecture: linux-any
Depends: ceph-base (= ${binary:Version}),
${misc:Depends},
${python:Depends},
${shlibs:Depends}
Replaces: ceph (<< 0.93-417)
Breaks: ceph (<< 0.93-417)
Expand Down Expand Up @@ -176,6 +178,7 @@ Architecture: linux-any
Depends: ceph-base (= ${binary:Version}),
python-flask,
${misc:Depends},
${python:Depends},
${shlibs:Depends}
Recommends: ceph-common
Replaces: ceph (<< 10)
Expand Down Expand Up @@ -606,6 +609,7 @@ Depends: ceph-common (= ${binary:Version}),
mime-support,
librgw2 (= ${binary:Version}),
${misc:Depends},
${python:Depends},
${shlibs:Depends}
Recommends: ntp | time-daemon
Description: REST gateway for RADOS distributed object store
Expand Down

0 comments on commit b400c15

Please sign in to comment.