ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1301 from guits/fix_1294 

Check if ceph_conf_overrides.global is defined before calling it
pull/1306/head
Andrew Schoen 2017-02-10 10:20:14 -06:00 committed by GitHub
parent 94ac749918 4295d427b9
commit c5a5658e09
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/ceph-client/tasks/main.yml
View File

@ -3,4 +3,5 @@
- include: create_users_keys.yml - include: create_users_keys.yml
when: when:
- user_config - user_config
- global_in_ceph_conf_overrides
- ceph_conf_overrides.global.osd_pool_default_pg_num is defined - ceph_conf_overrides.global.osd_pool_default_pg_num is defined

4
roles/ceph-client/tasks/pre_requisite.yml
View File

@ -7,3 +7,7 @@
group: "ceph" group: "ceph"
mode: "0600" mode: "0600"
when: cephx when: cephx
- name: check if global key exists in ceph_conf_overrides
set_fact:
global_in_ceph_conf_overrides: "{{ 'global' in ceph_conf_overrides }}"

6
roles/ceph-mon/tasks/ceph_keys.yml
View File

@ -78,7 +78,9 @@
- set_fact: - set_fact:
osd_pool_default_pg_num: "{{ ceph_conf_overrides.global.osd_pool_default_pg_num }}" osd_pool_default_pg_num: "{{ ceph_conf_overrides.global.osd_pool_default_pg_num }}"
when: ceph_conf_overrides.global.osd_pool_default_pg_num is defined when:
- global_in_ceph_conf_overrides
- ceph_conf_overrides.global.osd_pool_default_pg_num is defined
- name: test if rbd exists - name: test if rbd exists
command: ceph --cluster {{ cluster }} osd pool stats rbd command: ceph --cluster {{ cluster }} osd pool stats rbd
@ -92,11 +94,13 @@
- include: rbd_pool_pgs.yml - include: rbd_pool_pgs.yml
when: when:
- rbd_pool_exist.rc == 0 - rbd_pool_exist.rc == 0
- global_in_ceph_conf_overrides
- ceph_conf_overrides.global.osd_pool_default_pg_num is defined - ceph_conf_overrides.global.osd_pool_default_pg_num is defined
- include: rbd_pool_size.yml - include: rbd_pool_size.yml
when: when:
- rbd_pool_exist.rc == 0 - rbd_pool_exist.rc == 0
- global_in_ceph_conf_overrides
- ceph_conf_overrides.global.osd_pool_default_size is defined - ceph_conf_overrides.global.osd_pool_default_size is defined
- include: openstack_config.yml - include: openstack_config.yml