Skip to content

Extend the cephadm commands to allow defaults and extras #701

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

Merged
merged 8 commits into from
Nov 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions etc/kayobe/cephadm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,14 @@ cephadm_cluster_network: "{{ storage_mgmt_net_name | net_cidr }}"
# stackhpc.cephadm.commands for format. Pre commands run before the rest of the
# post-deployment configuration, post commands run after the rest of the
# post-deployment configuration.
#cephadm_commands_pre:
#cephadm_commands_post:
cephadm_commands_pre: "{{ cephadm_commands_pre_default + cephadm_commands_pre_extra }}"
cephadm_commands_post: "{{ cephadm_commands_post_default + cephadm_commands_post_extra }}"

cephadm_commands_pre_default: []
cephadm_commands_pre_extra: []

cephadm_commands_post_default: "{{ ['mgr module enable prometheus'] if kolla_enable_prometheus_ceph_mgr_exporter | bool else [] }}"
cephadm_commands_post_extra: []

###############################################################################
# Kolla Ceph auto-configuration.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
features:
- |
The Cephadm pre and post commands now support default commands with the
variables ``cephadm_commands_pre_default`` and
``cephadm_commands_post_default``. As such, any extra commands should be
added to the variables ``cephadm_commands_pre_extra`` and
``cephadm_commands_post_extra``.