ceph-defaults: bring backward compatibility for old syntax

If people keep on using the mon_cap, osd_cap etc the playbook will
translate this old syntax on the flight.

Signed-off-by: Sébastien Han <seb@redhat.com>
pull/2518/head
Sébastien Han 2018-04-10 15:39:44 +02:00 committed by Guillaume Abrioux
parent 82589021e0
commit 82ccbdafbc
3 changed files with 28 additions and 0 deletions

View File

@ -1,4 +1,17 @@
--- ---
- name: set_fact keys_tmp - preserve backward compatibility after the introduction of the ceph_keys module
set_fact:
keys_tmp: "{{ keys_tmp|default([]) + [ { 'key': item.key, 'name': item.name, 'caps': { 'mon': item.mon_cap, 'osd': item.osd_cap|default(''), 'mds': item.mds_cap|default(''), 'mgr': item.mgr_cap|default('') } , 'mode': item.mode } ] }}"
when:
- item.get('mon_cap', None) # it's enough to assume we are running an old-fashionned syntax simply by checking the presence of mon_cap since every key needs this cap
with_items: "{{ keys }}"
- name: set_fact keys - override keys_tmp with keys
set_fact:
keys: "{{ keys_tmp }}"
when:
- keys_tmp is defined
- name: run a dummy container (sleep 300) from where we can create pool(s)/key(s) - name: run a dummy container (sleep 300) from where we can create pool(s)/key(s)
command: > command: >
docker run \ docker run \

View File

@ -200,3 +200,5 @@
check_mode: no check_mode: no
when: when:
- ansible_os_family == 'RedHat' - ansible_os_family == 'RedHat'

View File

@ -40,6 +40,19 @@
- name: include set_osd_pool_default_pg_num.yml - name: include set_osd_pool_default_pg_num.yml
include: set_osd_pool_default_pg_num.yml include: set_osd_pool_default_pg_num.yml
- name: set_fact openstack_keys_tmp - preserve backward compatibility after the introduction of the ceph_keys module
set_fact:
openstack_keys_tmp: "{{ openstack_keys_tmp|default([]) + [ { 'key': item.key, 'name': item.name, 'caps': { 'mon': item.mon_cap, 'osd': item.osd_cap|default(''), 'mds': item.mds_cap|default(''), 'mgr': item.mgr_cap|default('') } , 'mode': item.mode } ] }}"
with_items: "{{ openstack_keys }}"
when:
- item.get('mon_cap', None) # it's enough to assume we are running an old-fashionned syntax simply by checking the presence of mon_cap since every key needs this cap
- name: set_fact keys - override keys_tmp with keys
set_fact:
openstack_keys: "{{ openstack_keys_tmp }}"
when:
- openstack_keys_tmp is defined
# Create the pools listed in openstack_pools # Create the pools listed in openstack_pools
- name: include openstack_config.yml - name: include openstack_config.yml
include: openstack_config.yml include: openstack_config.yml