Skip to content
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

cephadm-adopt: fix "Update the placement of radosgw hosts" task (backport #7575) #7577

Merged
merged 1 commit into from
Aug 6, 2024
Merged

cephadm-adopt: fix "Update the placement of radosgw hosts" task (backport #7575) #7577

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions infrastructure-playbooks/cephadm-adopt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
- (health_detail.stdout | default('{}', True) | from_json)['status'] == "HEALTH_WARN"
- "'POOL_APP_NOT_ENABLED' in (health_detail.stdout | default('{}', True) | from_json)['checks']"

- import_role:

Check warning on line 109 in infrastructure-playbooks/cephadm-adopt.yml

View workflow job for this annotation

GitHub Actions / build

jinja[spacing] 

Jinja2 spacing could be improved: groups.get((grafana_server_group_name|default('grafana-server')), []) | length > 0 -> groups.get((grafana_server_group_name | default('grafana-server')), []) | length > 0
name: ceph-facts
tasks_from: convert_grafana_server_group_name.yml
when: groups.get((grafana_server_group_name|default('grafana-server')), []) | length > 0
Expand Down Expand Up @@ -495,7 +495,7 @@

- name: set_fact mirror_peer_found
set_fact:
mirror_peer_uuid: "{{ ((mirror_pool_info.stdout | default('{}') | from_json)['peers'] | selectattr('site_name', 'match', '^'+ceph_rbd_mirror_remote_cluster+'$') | map(attribute='uuid') | list) }}"

Check warning on line 498 in infrastructure-playbooks/cephadm-adopt.yml

View workflow job for this annotation

GitHub Actions / build

jinja[spacing] 

Jinja2 spacing could be improved: {{ ((mirror_pool_info.stdout | default('{}') | from_json)['peers'] | selectattr('site_name', 'match', '^'+ceph_rbd_mirror_remote_cluster+'$') | map(attribute='uuid') | list) }} -> {{ ((mirror_pool_info.stdout | default('{}') | from_json)['peers'] | selectattr('site_name', 'match', '^' + ceph_rbd_mirror_remote_cluster + '$') | map(attribute='uuid') | list) }}

- name: remove current rbd mirror peer, add new peer into mon config store
when: mirror_peer_uuid | length > 0
Expand All @@ -520,7 +520,7 @@
loop: "{{ (quorum_status.stdout | default('{}') | from_json)['monmap']['mons'] }}"
run_once: true

- name: remove current mirror peer

Check warning on line 523 in infrastructure-playbooks/cephadm-adopt.yml

View workflow job for this annotation

GitHub Actions / build

jinja[spacing] 

Jinja2 spacing could be improved: {{ admin_rbd_cmd }} mirror pool peer remove {{ ceph_rbd_mirror_pool }} {{ ((mirror_pool_info.stdout | default('{}') | from_json)['peers'] | selectattr('site_name', 'match', '^'+ceph_rbd_mirror_remote_cluster+'$') | map(attribute='uuid') | list)[0] }} -> {{ admin_rbd_cmd }} mirror pool peer remove {{ ceph_rbd_mirror_pool }} {{ ((mirror_pool_info.stdout | default('{}') | from_json)['peers'] | selectattr('site_name', 'match', '^' + ceph_rbd_mirror_remote_cluster + '$') | map(attribute='uuid') | list)[0] }}
command: "{{ admin_rbd_cmd }} mirror pool peer remove {{ ceph_rbd_mirror_pool }} {{ ((mirror_pool_info.stdout | default('{}') | from_json)['peers'] | selectattr('site_name', 'match', '^'+ceph_rbd_mirror_remote_cluster+'$') | map(attribute='uuid') | list)[0] }}"
delegate_to: "{{ groups.get(mon_group_name | default('mons'))[0] }}"
changed_when: false
Expand Down Expand Up @@ -1024,10 +1024,14 @@
count_per_host: {{ radosgw_num_instances }}
hosts:
- {{ ansible_facts['nodename'] }}
{{ "networks: rgw_subnet" if rgw_subnet is defined }}
{% if rgw_subnet is defined %}
networks: "{{ rgw_subnet }}"
{% endif %}
spec:
rgw_frontend_port: {{ radosgw_frontend_port }}
{{ "ssl: true" if radosgw_frontend_ssl_certificate }}
{% if radosgw_frontend_ssl_certificate is defined %}
{{ "ssl: true" }}
{% endif %}
extra_container_args:
- -v
- /etc/pki/ca-trust:/etc/pki/ca-trust:ro
Expand Down
Loading