Skip to content

Commit c7a2c0e

Browse files
fultonjopenshift-merge-bot[bot]
authored andcommitted
[cifmw_cephadm] Add cifmw_cephadm_auth_allowed_ciphers parameter
Add a new optional string parameter cifmw_cephadm_auth_allowed_ciphers to the cifmw_cephadm role. When set, the role runs the fullowing during cluster configuration (cephadm_config_set.yml) ceph mon set auth_allowed_ciphers <value> The parameter defaults to "" and is a no-op when unset, so existing deployments are unaffected. Document the parameter and its use cases in the role README. Assisted-By: Claude Sonnet 4.6 <noreply@anthropic.com> Signed-off-by: John Fulton <fulton@redhat.com> Jira: OSPRH-29668
1 parent cfcb453 commit c7a2c0e

3 files changed

Lines changed: 16 additions & 0 deletions

File tree

roles/cifmw_cephadm/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,11 @@ that they do not need to be changed for a typical EDPM deployment.
117117
releases prior to Tentacle, this option is not required, as both `NFSv3`
118118
and `NFSv4` are enabled by default.
119119

120+
* `cifmw_cephadm_auth_allowed_ciphers`: (String) When set, runs
121+
`ceph mon set auth_allowed_ciphers <value>` during cluster configuration.
122+
Example values are `"aes,aes256k"` or `"aes256k"` or `"aes"`.
123+
Defaults to `""` (unset, no command is run).
124+
120125
Use the `cifmw_cephadm_pools` list of dictionaries to define pools for
121126
Nova (vms), Cinder (volumes), Cinder-backups (backups), and Glance (images).
122127
```

roles/cifmw_cephadm/defaults/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ cifmw_cephadm_internal_tls_enabled: false
5353
cifmw_cephadm_certs: /etc/pki/tls
5454
cifmw_cephadm_debug: false
5555
cifmw_cephadm_min_compat_client: "mimic"
56+
cifmw_cephadm_auth_allowed_ciphers: ""
5657
cifmw_cephadm_deployed_ceph: false
5758
cifmw_cephadm_backend: ''
5859
cifmw_cephadm_action: disable

roles/cifmw_cephadm/tasks/cephadm_config_set.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,16 @@
5252
{{ cifmw_cephadm_min_compat_client }}
5353
changed_when: false
5454

55+
- name: Set Ceph auth_allowed_ciphers
56+
become: true
57+
when:
58+
- cifmw_cephadm_auth_allowed_ciphers is defined
59+
- cifmw_cephadm_auth_allowed_ciphers | length > 0
60+
ansible.builtin.command: |
61+
{{ cifmw_cephadm_ceph_cli }} mon set auth_allowed_ciphers \
62+
{{ cifmw_cephadm_auth_allowed_ciphers }}
63+
changed_when: false
64+
5565
- name: Set container image base in ceph configuration
5666
become: true
5767
when:

0 commit comments

Comments
 (0)