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

Remove jinja2 delimiters from `when` keys 

This patch changes the `when:` keys so that they have no jinja2
delimiters. This avoids Ansible warnings which could turn into
errors in a future Ansible release.
pull/2044/head
Major Hayden 2017-10-12 11:27:36 -05:00
parent 17623a2157
commit c01851325e
No known key found for this signature in database
GPG Key ID: 737051E0C1011FB1
15 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infrastructure-playbooks/rolling_update.yml
View File

@ -541,7 +541,7 @@
- ceph-config - ceph-config
- { role: ceph-common, when: not containerized_deployment } - { role: ceph-common, when: not containerized_deployment }
- { role: ceph-docker-common, when: containerized_deployment } - { role: ceph-docker-common, when: containerized_deployment }
- { role: ceph-mgr, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" } - { role: ceph-mgr, when: "ceph_release_num[ceph_release] >= ceph_release_num.luminous" }
post_tasks: post_tasks:
- name: start ceph mgrs - name: start ceph mgrs

2
roles/ceph-fetch-keys/tasks/main.yml
View File

@ -18,7 +18,7 @@
- name: set_fact bootstrap_rbd_keyring - name: set_fact bootstrap_rbd_keyring
set_fact: set_fact:
bootstrap_rbd_keyring: "/var/lib/ceph/bootstrap-rbd/{{ cluster }}.keyring" bootstrap_rbd_keyring: "/var/lib/ceph/bootstrap-rbd/{{ cluster }}.keyring"
when: ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous when: ceph_release_num[ceph_release] >= ceph_release_num.luminous
- name: copy keys to the ansible server - name: copy keys to the ansible server
fetch: fetch:

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

@ -6,7 +6,7 @@
changed_when: false changed_when: false
when: when:
- cephx - cephx
- ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous - ceph_release_num[ceph_release] >= ceph_release_num.luminous
tags: tags:
- always - always
@ -15,7 +15,7 @@
changed_when: false changed_when: false
when: when:
- cephx - cephx
- ceph_release_num.{{ ceph_release }} < ceph_release_num.luminous - ceph_release_num[ceph_release] < ceph_release_num.luminous
tags: tags:
- always - always
@ -79,7 +79,7 @@
- cephx - cephx
- groups.get(mgr_group_name, []) | length > 0 - groups.get(mgr_group_name, []) | length > 0
- inventory_hostname == groups[mon_group_name]|last - inventory_hostname == groups[mon_group_name]|last
- ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel - ceph_release_num[ceph_release] > ceph_release_num.jewel
with_items: "{{ groups.get(mgr_group_name, []) }}" with_items: "{{ groups.get(mgr_group_name, []) }}"
- name: crush_rules.yml - name: crush_rules.yml
@ -111,7 +111,7 @@
set_fact: set_fact:
bootstrap_rbd_keyring: "/var/lib/ceph/bootstrap-rbd/{{ cluster }}.keyring" bootstrap_rbd_keyring: "/var/lib/ceph/bootstrap-rbd/{{ cluster }}.keyring"
when: when:
- ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous - ceph_release_num[ceph_release] >= ceph_release_num.luminous
- name: copy keys to the ansible server - name: copy keys to the ansible server
fetch: fetch:

4
roles/ceph-mon/tasks/create_mds_filesystems.yml
View File

@ -21,13 +21,13 @@
command: "{{ docker_exec_cmd }} ceph --cluster {{ cluster }} fs set {{ cephfs }} allow_multimds true --yes-i-really-mean-it" command: "{{ docker_exec_cmd }} ceph --cluster {{ cluster }} fs set {{ cephfs }} allow_multimds true --yes-i-really-mean-it"
changed_when: false changed_when: false
when: when:
- ceph_release_num.{{ ceph_release }} >= ceph_release_num.jewel - ceph_release_num[ceph_release] >= ceph_release_num.jewel
- mds_allow_multimds - mds_allow_multimds
- name: set max_mds - name: set max_mds
command: "{{ docker_exec_cmd }} ceph --cluster {{ cluster }} fs set {{ cephfs }} max_mds {{ mds_max_mds }}" command: "{{ docker_exec_cmd }} ceph --cluster {{ cluster }} fs set {{ cephfs }} max_mds {{ mds_max_mds }}"
changed_when: false changed_when: false
when: when:
- ceph_release_num.{{ ceph_release }} >= ceph_release_num.jewel - ceph_release_num[ceph_release] >= ceph_release_num.jewel
- mds_allow_multimds - mds_allow_multimds
- mds_max_mds > 1 - mds_max_mds > 1

4
roles/ceph-mon/tasks/deploy_monitors.yml
View File

@ -43,7 +43,7 @@
set_fact: set_fact:
ceph_authtool_cap: "--cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow' --cap mgr 'allow *'" ceph_authtool_cap: "--cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow' --cap mgr 'allow *'"
when: when:
- ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous - ceph_release_num[ceph_release] >= ceph_release_num.luminous
- cephx - cephx
- admin_secret != 'admin_secret' - admin_secret != 'admin_secret'
@ -51,7 +51,7 @@
set_fact: set_fact:
ceph_authtool_cap: "--cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow'" ceph_authtool_cap: "--cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow'"
when: when:
- ceph_release_num.{{ ceph_release }} < ceph_release_num.luminous - ceph_release_num[ceph_release] < ceph_release_num.luminous
- cephx - cephx
- admin_secret != 'admin_secret' - admin_secret != 'admin_secret'

4
roles/ceph-mon/tasks/docker/copy_configs.yml
View File

@ -13,12 +13,12 @@
set_fact: set_fact:
bootstrap_rbd_keyring: bootstrap_rbd_keyring:
- "/var/lib/ceph/bootstrap-rbd/{{ cluster }}.keyring" - "/var/lib/ceph/bootstrap-rbd/{{ cluster }}.keyring"
when: ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous when: ceph_release_num[ceph_release] >= ceph_release_num.luminous
- name: merge rbd bootstrap key to config and keys paths - name: merge rbd bootstrap key to config and keys paths
set_fact: set_fact:
ceph_config_keys: "{{ ceph_config_keys + bootstrap_rbd_keyring }}" ceph_config_keys: "{{ ceph_config_keys + bootstrap_rbd_keyring }}"
when: ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous when: ceph_release_num[ceph_release] >= ceph_release_num.luminous
- name: set_fact tmp_ceph_mgr_keys add mgr keys to config and keys paths - name: set_fact tmp_ceph_mgr_keys add mgr keys to config and keys paths
set_fact: set_fact:

2
roles/ceph-mon/tasks/docker/main.yml
View File

@ -126,4 +126,4 @@
- item.stat.exists == true - item.stat.exists == true
when: when:
- inventory_hostname == groups[mon_group_name]|last - inventory_hostname == groups[mon_group_name]|last
- ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous - ceph_release_num[ceph_release] >= ceph_release_num.luminous

12
roles/ceph-osd/tasks/ceph_disk_cli_options_facts.yml
View File

@ -5,7 +5,7 @@
when: when:
- osd_objectstore == 'bluestore' - osd_objectstore == 'bluestore'
- not dmcrypt - not dmcrypt
- ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous - ceph_release_num[ceph_release] >= ceph_release_num.luminous
- not containerized_deployment - not containerized_deployment
- name: set_fact ceph_disk_cli_options 'ceph_disk_cli_options' - name: set_fact ceph_disk_cli_options 'ceph_disk_cli_options'
@ -14,7 +14,7 @@
when: when:
- osd_objectstore == 'filestore' - osd_objectstore == 'filestore'
- not dmcrypt - not dmcrypt
- ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous - ceph_release_num[ceph_release] >= ceph_release_num.luminous
- not containerized_deployment - not containerized_deployment
- name: set_fact ceph_disk_cli_options '--cluster {{ cluster }}' - name: set_fact ceph_disk_cli_options '--cluster {{ cluster }}'
@ -23,7 +23,7 @@
when: when:
- osd_objectstore == 'filestore' - osd_objectstore == 'filestore'
- not dmcrypt - not dmcrypt
- ceph_release_num.{{ ceph_release }} < ceph_release_num.luminous - ceph_release_num[ceph_release] < ceph_release_num.luminous
- not containerized_deployment - not containerized_deployment
- name: set_fact ceph_disk_cli_options '--cluster {{ cluster }} --bluestore --dmcrypt' - name: set_fact ceph_disk_cli_options '--cluster {{ cluster }} --bluestore --dmcrypt'
@ -32,7 +32,7 @@
when: when:
- osd_objectstore == 'bluestore' - osd_objectstore == 'bluestore'
- dmcrypt - dmcrypt
- ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous - ceph_release_num[ceph_release] >= ceph_release_num.luminous
- not containerized_deployment - not containerized_deployment
- name: set_fact ceph_disk_cli_options '--cluster {{ cluster }} --filestore --dmcrypt' - name: set_fact ceph_disk_cli_options '--cluster {{ cluster }} --filestore --dmcrypt'
@ -41,7 +41,7 @@
when: when:
- osd_objectstore == 'filestore' - osd_objectstore == 'filestore'
- dmcrypt - dmcrypt
- ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous - ceph_release_num[ceph_release] >= ceph_release_num.luminous
- not containerized_deployment - not containerized_deployment
- name: set_fact ceph_disk_cli_options '--cluster {{ cluster }} --dmcrypt' - name: set_fact ceph_disk_cli_options '--cluster {{ cluster }} --dmcrypt'
@ -50,7 +50,7 @@
when: when:
- osd_objectstore == 'filestore' - osd_objectstore == 'filestore'
- dmcrypt - dmcrypt
- ceph_release_num.{{ ceph_release }} < ceph_release_num.luminous - ceph_release_num[ceph_release] < ceph_release_num.luminous
- not containerized_deployment - not containerized_deployment
- name: set_fact docker_env_args '-e KV_TYPE={{ kv_type }} -e KV_IP={{ kv_endpoint }} -e KV_PORT={{ kv_port }}' - name: set_fact docker_env_args '-e KV_TYPE={{ kv_type }} -e KV_IP={{ kv_endpoint }} -e KV_PORT={{ kv_port }}'

4
roles/ceph-osd/tasks/check_mandatory_vars.yml
View File

@ -56,7 +56,7 @@
- osd_group_name in group_names - osd_group_name in group_names
- not containerized_deployment - not containerized_deployment
- osd_scenario == "lvm" - osd_scenario == "lvm"
- ceph_release_num.{{ ceph_release }} < ceph_release_num.luminous - ceph_release_num[ceph_release] < ceph_release_num.luminous
- name: verify osd_objectstore is 'filestore' when using the lvm osd_scenario - name: verify osd_objectstore is 'filestore' when using the lvm osd_scenario
fail: fail:
@ -128,4 +128,4 @@
- osd_group_name in group_names - osd_group_name in group_names
- not containerized_deployment - not containerized_deployment
- osd_objectstore == 'bluestore' - osd_objectstore == 'bluestore'
- ceph_release_num.{{ ceph_release }} < ceph_release_num.luminous - ceph_release_num[ceph_release] < ceph_release_num.luminous

2
roles/ceph-rbd-mirror/tasks/docker/copy_configs.yml
View File

@ -3,7 +3,7 @@
set_fact: set_fact:
bootstrap_rbd_keyring: "/var/lib/ceph/bootstrap-rbd/{{ cluster }}.keyring" bootstrap_rbd_keyring: "/var/lib/ceph/bootstrap-rbd/{{ cluster }}.keyring"
when: when:
- ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous - ceph_release_num[ceph_release] >= ceph_release_num.luminous
- name: set_fact ceph_config_keys - name: set_fact ceph_config_keys
set_fact: set_fact:

8
roles/ceph-rbd-mirror/tasks/pre_requisite.yml
View File

@ -17,7 +17,7 @@
mode: "0600" mode: "0600"
when: when:
- cephx - cephx
- ceph_release_num.{{ ceph_release }} < ceph_release_num.luminous or copy_admin_key - ceph_release_num[ceph_release] < ceph_release_num.luminous or copy_admin_key
- name: copy rbd-mirror bootstrap key - name: copy rbd-mirror bootstrap key
copy: copy:
@ -28,7 +28,7 @@
mode: "0600" mode: "0600"
when: when:
- cephx - cephx
- ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous - ceph_release_num[ceph_release] >= ceph_release_num.luminous
- name: create rbd-mirror keyring - name: create rbd-mirror keyring
command: ceph --cluster {{ cluster }} --name client.bootstrap-rbd --keyring /var/lib/ceph/bootstrap-rbd/{{ cluster }}.keyring auth get-or-create client.rbd-mirror.{{ ansible_hostname }} mon 'profile rbd' osd 'profile rbd' -o /etc/ceph/{{ cluster }}.client.rbd-mirror.{{ ansible_hostname }}.keyring command: ceph --cluster {{ cluster }} --name client.bootstrap-rbd --keyring /var/lib/ceph/bootstrap-rbd/{{ cluster }}.keyring auth get-or-create client.rbd-mirror.{{ ansible_hostname }} mon 'profile rbd' osd 'profile rbd' -o /etc/ceph/{{ cluster }}.client.rbd-mirror.{{ ansible_hostname }}.keyring
@ -37,7 +37,7 @@
changed_when: false changed_when: false
when: when:
- cephx - cephx
- ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous - ceph_release_num[ceph_release] >= ceph_release_num.luminous
- name: set rbd-mirror key permissions - name: set rbd-mirror key permissions
file: file:
@ -47,5 +47,5 @@
mode: "0600" mode: "0600"
when: when:
- cephx - cephx
- ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous - ceph_release_num[ceph_release] >= ceph_release_num.luminous

8
roles/ceph-rbd-mirror/tasks/start_rbd_mirror.yml
View File

@ -24,7 +24,7 @@
enabled: yes enabled: yes
changed_when: false changed_when: false
when: when:
- ceph_release_num.{{ ceph_release }} < ceph_release_num.luminous - ceph_release_num[ceph_release] < ceph_release_num.luminous
- name: stop and remove the generic rbd-mirror service instance - name: stop and remove the generic rbd-mirror service instance
service: service:
@ -33,7 +33,7 @@
enabled: no enabled: no
changed_when: false changed_when: false
when: when:
- ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous - ceph_release_num[ceph_release] >= ceph_release_num.luminous
# This task is a workaround for rbd-mirror not starting after reboot # This task is a workaround for rbd-mirror not starting after reboot
# The upstream fix is: https://github.com/ceph/ceph/pull/17969 # The upstream fix is: https://github.com/ceph/ceph/pull/17969
@ -44,7 +44,7 @@
enabled: yes enabled: yes
changed_when: false changed_when: false
when: when:
- ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous - ceph_release_num[ceph_release] >= ceph_release_num.luminous
- name: start and add the rbd-mirror service instance - name: start and add the rbd-mirror service instance
service: service:
@ -53,4 +53,4 @@
enabled: yes enabled: yes
changed_when: false changed_when: false
when: when:
- ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous - ceph_release_num[ceph_release] >= ceph_release_num.luminous

2
roles/ceph-rgw/tasks/main.yml
View File

@ -38,7 +38,7 @@
when: when:
- rgw_zone is defined - rgw_zone is defined
- rgw_multisite - rgw_multisite
- ceph_release_num.{{ ceph_release }} >= ceph_release_num.jewel - ceph_release_num[ceph_release] >= ceph_release_num.jewel
# Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent) # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
static: False static: False

8
site-docker.yml.sample
View File

@ -39,8 +39,8 @@
roles: roles:
- ceph-defaults - ceph-defaults
- ceph-docker-common - ceph-docker-common
- { role: ceph-config, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" } - { role: ceph-config, when: "ceph_release_num[ceph_release] >= ceph_release_num.luminous" }
- { role: ceph-mgr, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" } - { role: ceph-mgr, when: "ceph_release_num[ceph_release] >= ceph_release_num.luminous" }
- hosts: osds - hosts: osds
become: True become: True
@ -75,8 +75,8 @@
roles: roles:
- ceph-defaults - ceph-defaults
- ceph-docker-common - ceph-docker-common
- { role: ceph-config, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" } - { role: ceph-config, when: "ceph_release_num[ceph_release] >= ceph_release_num.luminous" }
- { role: ceph-nfs, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" } - { role: ceph-nfs, when: "ceph_release_num[ceph_release] >= ceph_release_num.luminous" }
- hosts: rbdmirrors - hosts: rbdmirrors
become: True become: True

12
site.yml.sample
View File

@ -67,8 +67,8 @@
roles: roles:
- ceph-defaults - ceph-defaults
- ceph-common - ceph-common
- { role: ceph-config, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" } - { role: ceph-config, when: "ceph_release_num[ceph_release] >= ceph_release_num.luminous" }
- { role: ceph-mgr, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" } - { role: ceph-mgr, when: "ceph_release_num[ceph_release] >= ceph_release_num.luminous" }
- hosts: agents - hosts: agents
gather_facts: false gather_facts: false
@ -112,8 +112,8 @@
roles: roles:
- ceph-defaults - ceph-defaults
- ceph-common - ceph-common
- { role: ceph-config, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" } - { role: ceph-config, when: "ceph_release_num[ceph_release] >= ceph_release_num.luminous" }
- { role: ceph-nfs, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" } - { role: ceph-nfs, when: "ceph_release_num[ceph_release] >= ceph_release_num.luminous" }
- hosts: restapis - hosts: restapis
gather_facts: false gather_facts: false
@ -148,6 +148,6 @@
roles: roles:
- ceph-defaults - ceph-defaults
- ceph-common - ceph-common
- { role: ceph-config, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" } - { role: ceph-config, when: "ceph_release_num[ceph_release] >= ceph_release_num.luminous" }
- { role: ceph-iscsi-gw, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" } - { role: ceph-iscsi-gw, when: "ceph_release_num[ceph_release] >= ceph_release_num.luminous" }