openstack
/
tripleo-ansible
Code Issues Proposed changes

Merge "Explicitly cast boolean variables in cephadm playbook" into stable/wallaby

This commit is contained in:
Zuul 2022-04-06 18:48:00 +00:00 committed by Gerrit Code Review
parent dad29f37eb 4a7552fdc9
commit 0bc2994fb0
9 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tripleo_ansible/playbooks/cephadm.yml
View File

@ -26,22 +26,22 @@
name: tripleo_cephadm
tasks_from: bootstrap
when:
- not tripleo_cephadm_deployed_ceph
- not tripleo_cephadm_deployed_ceph | bool
- name: Apply ceph_conf_overrides on update
import_role:
name: tripleo_cephadm
tasks_from: apply_ceph_conf_overrides
when:
- tripleo_cephadm_apply_ceph_conf_overrides_on_update
- tripleo_cephadm_apply_ceph_conf_overrides_on_update | bool
- name: Apply Ceph spec
import_role:
name: tripleo_cephadm
tasks_from: apply_spec
when:
- not tripleo_cephadm_spec_on_bootstrap
- not tripleo_cephadm_deployed_ceph
- not tripleo_cephadm_spec_on_bootstrap | bool
- not tripleo_cephadm_deployed_ceph | bool
- name: Set crush rules if provided
import_role:

2
tripleo_ansible/roles/tripleo_cephadm/molecule/default/converge.yml
View File

@ -19,6 +19,8 @@
vars:
tripleo_cephadm_wait_for_mons: false
tripleo_ceph_client_vars: ceph_client.yaml
tripleo_cephadm_fsid_list:
- "cc7adc82-32eb-531e-b173-54047020ea3c"
tasks:
- name: Satisfy Ceph prerequisites
import_role:

2
tripleo_ansible/roles/tripleo_cephadm/molecule/default/prepare.yml
View File

@ -26,10 +26,12 @@
- openssh
tasks:
- name: Ensure ceph-admin group exists
become: true
group:
name: ceph-admin
state: present
- name: Ensure ceph-admin user exists
become: true
user:
name: ceph-admin
comment: ceph-admin

4
tripleo_ansible/roles/tripleo_cephadm/tasks/apply_spec.yaml
View File

@ -55,8 +55,8 @@
- name: Show results of spec apply
debug:
msg: "{{ tripleo_cephadm_apply_spec_out }}"
when: tripleo_cephadm_verbose
when: tripleo_cephadm_verbose | bool
- name: Wait for the expected number of osds to be running
include_tasks: wait_for_expected_num_osds.yaml
when: tripleo_cephadm_wait_for_osds
when: tripleo_cephadm_wait_for_osds | bool

4
tripleo_ansible/roles/tripleo_cephadm/tasks/bootstrap.yaml
View File

@ -17,7 +17,7 @@
- name: Add spec to necessary file list when using spec to bootstrap
set_fact:
tripleo_cephadm_bootstrap_files: "{{ tripleo_cephadm_bootstrap_files + [ tripleo_cephadm_spec ] }}"
when: tripleo_cephadm_spec_on_bootstrap
when: tripleo_cephadm_spec_on_bootstrap | bool
- name: Stat necessary files to bootstrap with cephadm
stat:
@ -68,7 +68,7 @@
- name: Show results of bootstrap
debug:
msg: "{{ cephadm_bootstrap }}"
when: tripleo_cephadm_verbose
when: tripleo_cephadm_verbose | bool
when:
- cephadm_ls is defined
- cephadm_ls.stdout == '[]'

8
tripleo_ansible/roles/tripleo_cephadm/tasks/cephadm_config_set.yaml
View File

@ -19,7 +19,7 @@
{{ tripleo_cephadm_ceph_cli }} config set mgr mgr/cephadm/log_to_cluster_level debug
changed_when: false
become: true
when: tripleo_cephadm_debug
when: tripleo_cephadm_debug | bool
- name: set default container image in ceph configuration
command: |
@ -28,7 +28,7 @@
changed_when: false
become: true
when:
- not (tripleo_cephadm_default_container | default(false))
- not (tripleo_cephadm_default_container | default(false) | bool)
- name: enforce minimum ceph clients version
command: |
@ -47,12 +47,12 @@
changed_when: false
become: true
when:
- not (tripleo_cephadm_default_container | default(false))
- not (tripleo_cephadm_default_container | default(false) | bool)
- name: set dashboard container image in ceph mgr configuration
when:
- tripleo_cephadm_dashboard_enabled | bool
- not (tripleo_cephadm_default_container | default(false))
- not (tripleo_cephadm_default_container | default(false) | bool)
become: true
block:
- name: set alertmanager container image in ceph configuration

2
tripleo_ansible/roles/tripleo_cephadm/tasks/dashboard/configure_dashboard_backends.yml
View File

@ -24,7 +24,7 @@
- name: Check the resulting mgr container instance
debug:
msg: "{{ ceph_mgr.stdout | regex_replace('^ceph-?(.*)-mgr.', '') }}"
when: tripleo_cephadm_verbose
when: tripleo_cephadm_verbose | bool
- name: config the current dashboard backend
command: |

2
tripleo_ansible/roles/tripleo_cephadm/tasks/export.yaml
View File

@ -25,7 +25,7 @@
- name: Wait for the expected number of monitors to be running
include_tasks: wait_for_expected_num_mons.yaml
when:
- not tripleo_cephadm_deployed_ceph
- not tripleo_cephadm_deployed_ceph | bool
- tripleo_cephadm_wait_for_mons | bool
- name: Run ceph mon dump to get all monitors

2
tripleo_ansible/roles/tripleo_cephadm/tasks/post.yaml
View File

@ -39,7 +39,7 @@
- name: Deployed daemons
debug:
msg: "{{ ceph_orch_ls.stdout_lines }}"
when: tripleo_cephadm_verbose
when: tripleo_cephadm_verbose | bool
- name: Print the status of the deployed Ceph cluster
command: "{{ tripleo_cephadm_ceph_cli }} -s"
become: true