Skip to content

mgr/cephadm: make j2 templates overwritable#37106

Merged
sebastian-philipp merged 1 commit intoceph:masterfrom
sebastian-philipp:cephadm-overwritable-templates
Sep 22, 2020
Merged

mgr/cephadm: make j2 templates overwritable#37106
sebastian-philipp merged 1 commit intoceph:masterfrom
sebastian-philipp:cephadm-overwritable-templates

Conversation

@sebastian-philipp
Copy link
Contributor

@sebastian-philipp sebastian-philipp commented Sep 11, 2020

This adds an escape hatch, if the configs generated
by cephadm are not flexible enough.

Downside is obviously that future upgrades might
break the daemons. Use at your own risk.

Signed-off-by: Sebastian Wagner sebastian.wagner@suse.com

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

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 api
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox

This adds an escape hatch, if the configs generated
by cephadm are not flexible enough.

Downside is obviously that future upgrades might
break the daemons. Use at your own risk.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
@sebastian-philipp
Copy link
Contributor Author

@sebastian-philipp sebastian-philipp added needs-review and removed wip-swagner-testing My Teuthology tests labels Sep 11, 2020
Copy link
Contributor

@p-se p-se left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, thank you!

@jschmid1
Copy link
Contributor

Fixes: https://tracker.ceph.com/issues/47335
should be in the commit message

@jschmid1 jschmid1 changed the title [RFC] mgr/cephadm: make j2 teamplates overwritable mgr/cephadm: make j2 teamplates overwritable Sep 15, 2020
Copy link
Contributor

@bk201 bk201 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be better to add a prefix to the key names?
To overwrite template services/foo/bar.j2, currently it expects a store named mgr/cephadm/services_foo_bar. How about prefixing it to mgr/cephadm/custom_templates/services_foo_bar to avoid unexpected name conflict?

@mgfritch
Copy link
Contributor

@sebastian-philipp sebastian-philipp merged commit 9899c6c into ceph:master Sep 22, 2020
@sebastian-philipp
Copy link
Contributor Author

Green:
https://pulpito.ceph.com/mgfritch-2020-09-21_20:24:35-rados:cephadm-wip-mgfritch-testing-2020-09-21-1034-distro-basic-smithi/

Failure:
https://tracker.ceph.com/issues/47591

I think it's unrelated

@p-se p-se changed the title mgr/cephadm: make j2 teamplates overwritable mgr/cephadm: make j2 templates overwritable Oct 16, 2020
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.

5 participants