mirror of https://github.com/ceph/ceph-ansible.git
lint: yaml space before and after {{ }}
Fix tasks using variables that did not have space before and after {{ }} Signed-off-by: Sébastien Han <seb@redhat.com>pull/3311/head
parent
1f8d58002c
commit
2cd0d2f1e6
|
@ -1,24 +1,24 @@
|
|||
---
|
||||
- name: check if /var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}/keyring already exists
|
||||
- name: check if /var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}/keyring already exists
|
||||
stat:
|
||||
path: /var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}/keyring
|
||||
path: /var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}/keyring
|
||||
register: initial_mon_keyring
|
||||
|
||||
- name: fail if /var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}/keyring doesn't exist
|
||||
- name: fail if /var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}/keyring doesn't exist
|
||||
fail:
|
||||
msg: "/var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}/keyring not found"
|
||||
msg: "/var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}/keyring not found"
|
||||
when:
|
||||
- not initial_mon_keyring.stat.exists
|
||||
|
||||
- name: get existing initial mon keyring if it already exists but not monitor_keyring.conf in {{ fetch_directory }}
|
||||
shell: |
|
||||
grep key /var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}/keyring | sed 's/^.*= //'
|
||||
grep key /var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}/keyring | sed 's/^.*= //'
|
||||
register: monitor_keyring
|
||||
when:
|
||||
- not monitor_keyring_conf.stat.exists
|
||||
|
||||
- name: test existing initial mon keyring
|
||||
command: ceph --connect-timeout 3 --cluster {{ cluster }} --keyring /var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}/keyring -n mon. fsid
|
||||
command: ceph --connect-timeout 3 --cluster {{ cluster }} --keyring /var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}/keyring -n mon. fsid
|
||||
changed_when: false
|
||||
register: test_initial_monitor_keyring
|
||||
ignore_errors: true
|
||||
|
|
|
@ -45,6 +45,6 @@
|
|||
|
||||
- name: set_fact _current_monitor_address
|
||||
set_fact:
|
||||
_current_monitor_address: "{{ item.addr }}"
|
||||
_current_monitor_address: "{{ item.addr }}"
|
||||
with_items: "{{ _monitor_addresses }}"
|
||||
when: inventory_hostname == item.name
|
|
@ -42,7 +42,7 @@
|
|||
delegate_to: "{{ groups[mon_group_name][0] }}"
|
||||
|
||||
- name: create a rbd pool if it doesn't exist
|
||||
command: "{{ docker_exec_cmd | default('') }} ceph --cluster {{ cluster }} osd pool create rbd {{ (osd_pool_default_pg_num.stdout | from_json).osd_pool_default_pg_num }}"
|
||||
command: "{{ docker_exec_cmd | default('') }} ceph --cluster {{ cluster }} osd pool create rbd {{ (osd_pool_default_pg_num.stdout | from_json).osd_pool_default_pg_num }}"
|
||||
changed_when: false
|
||||
delegate_to: "{{ groups[mon_group_name][0] }}"
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
- containerized_deployment
|
||||
|
||||
- name: check if "{{ ceph_nfs_rgw_user }}" exists
|
||||
command: "{{ docker_exec_cmd_nfs | default('') }} radosgw-admin --cluster {{ cluster }} user info --uid={{ ceph_nfs_rgw_user }}"
|
||||
command: "{{ docker_exec_cmd_nfs | default('') }} radosgw-admin --cluster {{ cluster }} user info --uid={{ ceph_nfs_rgw_user }}"
|
||||
run_once: true
|
||||
register: rgwuser_exists
|
||||
changed_when: false
|
||||
|
@ -16,7 +16,7 @@
|
|||
- nfs_obj_gw
|
||||
|
||||
- name: create rgw nfs user "{{ ceph_nfs_rgw_user }}"
|
||||
command: "{{ docker_exec_cmd_nfs | default('') }} radosgw-admin --cluster {{ cluster }} user create --uid={{ ceph_nfs_rgw_user }} --display-name='RGW NFS User'"
|
||||
command: "{{ docker_exec_cmd_nfs | default('') }} radosgw-admin --cluster {{ cluster }} user create --uid={{ ceph_nfs_rgw_user }} --display-name='RGW NFS User'"
|
||||
run_once: true
|
||||
register: rgwuser
|
||||
changed_when: false
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
- name: update period
|
||||
command: "{{ docker_exec_cmd }} radosgw-admin --cluster {{ cluster }} period update --commit"
|
||||
command: "{{ docker_exec_cmd }} radosgw-admin --cluster {{ cluster }} period update --commit"
|
||||
delegate_to: "{{ groups[mon_group_name][0] }}"
|
||||
run_once: true
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
- rgw_create_pools is defined
|
||||
block:
|
||||
- name: create rgw pools if rgw_create_pools is defined
|
||||
command: "{{ docker_exec_cmd }} ceph --connect-timeout 5 --cluster {{ cluster }} osd pool create {{ item.key }} {{ item.value.pg_num }}"
|
||||
command: "{{ docker_exec_cmd }} ceph --connect-timeout 5 --cluster {{ cluster }} osd pool create {{ item.key }} {{ item.value.pg_num }}"
|
||||
changed_when: false
|
||||
with_dict: "{{ rgw_create_pools }}"
|
||||
delegate_to: "{{ groups[mon_group_name][0] }}"
|
||||
|
|
Loading…
Reference in New Issue