Simplify ceph.conf generation

Since the approach to creating a ceph.conf file has changed, and now
no-longer relies on assembling config file fragments in /etc/ceph/ceph.d
we can avoid the conf_overrides rendering on the local host and skip out
the tasks related to that, instead using just the config_template task
to configure the file directly.
pull/2450/head
Andy McCrae 2018-03-12 14:13:53 +00:00 committed by Guillaume Abrioux
parent e3275c1ca1
commit 388562a4af
1 changed files with 1 additions and 28 deletions

View File

@ -9,33 +9,6 @@
group: "ceph" group: "ceph"
mode: "0755" mode: "0755"
- name: template ceph_conf_overrides
copy:
content: "{{ ceph_conf_overrides }}"
dest: "/tmp/ceph_conf_overrides_temp_{{ ansible_hostname }}"
- name: copy tmp template file for ceph_conf_overrides to the ansible server
fetch:
src: "/tmp/ceph_conf_overrides_temp_{{ ansible_hostname }}"
dest: "{{ fetch_directory }}/{{ fsid }}/ceph_conf_overrides_temp_{{ ansible_hostname }}"
flat: yes
- name: get rendered ceph_conf_overrides
set_fact:
ceph_conf_overrides_rendered: "{{ lookup('template', '{{ fetch_directory }}/{{ fsid }}/ceph_conf_overrides_temp_{{ ansible_hostname }}') | from_yaml }}"
- name: remove tmp template file for ceph_conf_overrides
file:
path: "/tmp/ceph_conf_overrides_temp_{{ ansible_hostname }}"
state: absent
- name: remove tmp template file for ceph_conf_overrides (localhost)
local_action:
module: file
path: "{{ fetch_directory }}/{{ fsid }}/ceph_conf_overrides_temp_{{ ansible_hostname }}"
state: absent
become: false
- name: "generate ceph configuration file: {{ cluster }}.conf" - name: "generate ceph configuration file: {{ cluster }}.conf"
action: config_template action: config_template
args: args:
@ -44,7 +17,7 @@
owner: "ceph" owner: "ceph"
group: "ceph" group: "ceph"
mode: "0644" mode: "0644"
config_overrides: "{{ ceph_conf_overrides_rendered }}" config_overrides: "{{ ceph_conf_overrides }}"
config_type: ini config_type: ini
notify: notify:
- restart ceph mons - restart ceph mons