Skip to content

[cifmw_cephadm] default to shared container registry vars #3576

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.

Sign up for GitHub

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

Draft
tosky wants to merge 3 commits into
base: main
Choose a base branch
from
+12 −4
Draft

[cifmw_cephadm] default to shared container registry vars #3576

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c28ea5
[cifmw_cephadm] default to shared container registry vars
tosky Dec 23, 2025
dda3849
[cifmw_cephadm] quote the ceph credentials
tosky Dec 24, 2025
8426aab
[cifmw_cephadm] hide ceph sensitive details
tosky Dec 24, 2025
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
16 changes: 12 additions & 4 deletions roles/cifmw_cephadm/tasks/bootstrap.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@
- name: Run cephadm bootstrap
become: true
register: cephadm_bootstrap
vars:
_container_registry_url: "{{ cifmw_cephadm_registry_url|default(cifmw_registry_token_registry_url|default(''), True) }}"
_container_registry_username: "{{ cifmw_cephadm_registry_username|default(cifmw_registry_token.credentials.username|default(''), True) }}"
_container_registry_password: "{{ cifmw_cephadm_registry_password|default(cifmw_registry_token.credentials.password|default(''), True) }}"
ansible.builtin.shell: |
{{ cifmw_cephadm_bin }} \
{% if not cifmw_cephadm_default_container %}--image {{ cifmw_cephadm_container_ns + '/' + cifmw_cephadm_container_image + ':' + cifmw_cephadm_container_tag|string }} \{% endif %}
Expand All @@ -65,9 +69,9 @@
--output-keyring {{ cifmw_cephadm_admin_keyring }} \
--output-config {{ cifmw_cephadm_conf }} \
--fsid {{ cifmw_cephadm_fsid }} \
{% if cifmw_cephadm_registry_url|length > 0 %}--registry-url {{ cifmw_cephadm_registry_url }} \{% endif %}
{% if cifmw_cephadm_registry_username|length > 0 %}--registry-username {{ cifmw_cephadm_registry_username }} \{% endif %}
{% if cifmw_cephadm_registry_password|length > 0 %}--registry-password {{ cifmw_cephadm_registry_password }} \{% endif %}
{% if _container_registry_url|length > 0 %}--registry-url {{ _container_registry_url }} \{% endif %}
{% if _container_registry_username|length > 0 %}--registry-username {{ _container_registry_username|quote }} \{% endif %}
{% if _container_registry_password|length > 0 %}--registry-password {{ _container_registry_password|quote }} \{% endif %}
{% if cifmw_cephadm_spec_on_bootstrap %}--apply-spec {{ cifmw_cephadm_spec }} \{% endif %}
{% if cifmw_cephadm_assimilate_conf_stat.stat.exists %}--config {{ cifmw_cephadm_assimilate_conf }} \{% endif %}
{% if cifmw_cephadm_single_host_defaults %}--single-host-defaults \{% endif %}
Expand All @@ -78,7 +82,11 @@
- name: Show results of bootstrap
when: cifmw_cephadm_verbose | bool
ansible.builtin.debug:
msg: "{{ cephadm_bootstrap }}"
msg: >-
{{
cephadm_bootstrap
| to_yaml | regex_replace("(--registry-[^\s]+)\s+(['\"])(.+?)\2", "\1 \2<REDACTED>\2")
}}

- name: Ensure cifmw_cephadm_ceph_cli is set
when:
Expand Down
Loading