mirror of https://github.com/ceph/ceph-ansible.git
Merge pull request #2110 from fultonj/issue/2092
Make acls and mode parameters of opentack_keys optionalpull/2117/head
commit
787e54f73d
|
@ -70,6 +70,15 @@
|
|||
docker_exec_client_cmd:
|
||||
when: docker_exec_client_cmd == 'ceph'
|
||||
|
||||
- name: chmod key(s)
|
||||
file:
|
||||
path: "/etc/ceph/{{ cluster }}.{{ item.name }}.keyring"
|
||||
mode: "{{ item.mode|default(omit) }}" # if mode not in list, uses mode from ps umask
|
||||
with_items: "{{ keys }}"
|
||||
when:
|
||||
- cephx
|
||||
- keys | length > 0
|
||||
|
||||
- name: setfacl for key(s)
|
||||
acl:
|
||||
path: "/etc/ceph/{{ cluster }}.{{ item.0.name }}.keyring"
|
||||
|
@ -82,12 +91,3 @@
|
|||
when:
|
||||
- cephx
|
||||
- keys | length > 0
|
||||
|
||||
- name: chmod key(s)
|
||||
file:
|
||||
path: "/etc/ceph/{{ cluster }}.{{ item.name }}.keyring"
|
||||
mode: "{{ item.mode }}"
|
||||
with_items: "{{ keys }}"
|
||||
when:
|
||||
- cephx
|
||||
- keys | length > 0
|
||||
|
|
|
@ -50,6 +50,15 @@
|
|||
- openstack_config
|
||||
- item.0 != groups[mon_group_name] | last
|
||||
|
||||
- name: chmod openstack key(s)
|
||||
file:
|
||||
path: "/etc/ceph/{{ cluster }}.{{ item.name }}.keyring"
|
||||
mode: "{{ item.mode|default(omit) }}" # if mode not in list, uses mode from ps umask
|
||||
with_items: "{{ openstack_keys }}"
|
||||
when:
|
||||
- openstack_config
|
||||
- cephx
|
||||
|
||||
- name: setfacl for openstack key(s)
|
||||
acl:
|
||||
path: "/etc/ceph/{{ cluster }}.{{ item.0.name }}.keyring"
|
||||
|
@ -62,12 +71,3 @@
|
|||
when:
|
||||
- openstack_config
|
||||
- cephx
|
||||
|
||||
- name: chmod openstack key(s)
|
||||
file:
|
||||
path: "/etc/ceph/{{ cluster }}.{{ item.name }}.keyring"
|
||||
mode: "{{ item.mode }}"
|
||||
with_items: "{{ openstack_keys }}"
|
||||
when:
|
||||
- openstack_config
|
||||
- cephx
|
||||
|
|
Loading…
Reference in New Issue