Skip to content

cephadm: fix usage of custom Prometheus image#35961

Merged
sebastian-philipp merged 3 commits intoceph:masterfrom
p-se:cephadm-custom-image-fix
Jul 20, 2020
Merged

cephadm: fix usage of custom Prometheus image#35961
sebastian-philipp merged 3 commits intoceph:masterfrom
p-se:cephadm-custom-image-fix

Conversation

@p-se
Copy link
Contributor

@p-se p-se commented Jul 7, 2020

Fixes: https://tracker.ceph.com/issues/46398

Checklist

  • References tracker ticket
  • Updates documentation if necessary
  • Includes tests for new functionality or reproducer for bug

Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard backend
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox

@p-se p-se requested a review from a team as a code owner July 7, 2020 12:32
@p-se p-se changed the title cephadm: fix custom usage of custom Prometheus image cephadm: fix usage of custom Prometheus image Jul 7, 2020
@p-se p-se requested a review from sebastian-philipp July 9, 2020 13:47
p-se added 3 commits July 17, 2020 14:44
Fix the code by improving a condition where a zero as uid or gid leads
to an additional attempt to extract the uid/gid instead of uid/gid
simply being used correctly.

Fixes: https://tracker.ceph.com/issues/46398

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
@p-se p-se force-pushed the cephadm-custom-image-fix branch from 18b9b37 to 8844ff4 Compare July 17, 2020 12:50
@sebastian-philipp sebastian-philipp added the wip-swagner-testing My Teuthology tests label Jul 20, 2020
@sebastian-philipp
Copy link
Contributor

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants