openstack/kolla-ansible
Code Issues Proposed changes

Merge "Render ceph.conf using merge_configs"

Browse Source
This commit is contained in:
Jenkins 2017-01-17 16:40:03 +00:00 committed by Gerrit Code Review
commit 016d79f009
4 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ansible/roles/cinder/tasks/ceph.yml
View File

@ -8,9 +8,14 @@
- "cinder-backup" - "cinder-backup"
when: inventory_hostname in groups['cinder-volume'] when: inventory_hostname in groups['cinder-volume']
- name: Copying over config(s) - name: Copying over ceph.conf(s)
template: merge_configs:
src: roles/ceph/templates/ceph.conf.j2 vars:
service_name: "{{ item }}"
sources:
- "{{ role_path }}/../ceph/templates/ceph.conf.j2"
- "{{ node_custom_config }}/ceph.conf"
- "{{ node_custom_config }}/ceph/{{ inventory_hostname }}/ceph.conf"
dest: "{{ node_config_directory }}/{{ item }}/ceph.conf" dest: "{{ node_config_directory }}/{{ item }}/ceph.conf"
with_items: with_items:
- "cinder-volume" - "cinder-volume"

9
ansible/roles/glance/tasks/ceph.yml
View File

@ -5,9 +5,12 @@
state: "directory" state: "directory"
when: inventory_hostname in groups['glance-api'] when: inventory_hostname in groups['glance-api']
- name: Copying over config(s) - name: Copying over ceph.conf(s)
template: merge_configs:
src: roles/ceph/templates/ceph.conf.j2 sources:
- "{{ role_path }}/../ceph/templates/ceph.conf.j2"
- "{{ node_custom_config }}/ceph.conf"
- "{{ node_custom_config }}/ceph/{{ inventory_hostname }}/ceph.conf"
dest: "{{ node_config_directory }}/glance-api/ceph.conf" dest: "{{ node_config_directory }}/glance-api/ceph.conf"
when: inventory_hostname in groups['glance-api'] when: inventory_hostname in groups['glance-api']

11
ansible/roles/gnocchi/tasks/ceph.yml
View File

@ -9,9 +9,14 @@
- "gnocchi-metricd" - "gnocchi-metricd"
- "gnocchi-statsd" - "gnocchi-statsd"
- name: Copying over config(s) - name: Copying over ceph.conf(s)
template: merge_configs:
src: roles/ceph/templates/ceph.conf.j2 vars:
service_name: "{{ item }}"
sources:
- "{{ role_path }}/../ceph/templates/ceph.conf.j2"
- "{{ node_custom_config }}/ceph.conf"
- "{{ node_custom_config }}/ceph/{{ inventory_hostname }}/ceph.conf"
dest: "{{ node_config_directory }}/{{ item }}/ceph.conf" dest: "{{ node_config_directory }}/{{ item }}/ceph.conf"
when: inventory_hostname in groups[item] when: inventory_hostname in groups[item]
with_items: with_items:

11
ansible/roles/nova/tasks/ceph.yml
View File

@ -8,9 +8,14 @@
- "nova-libvirt/secrets" - "nova-libvirt/secrets"
when: inventory_hostname in groups['compute'] when: inventory_hostname in groups['compute']
- name: Copying over config(s) - name: Copying over ceph.conf(s)
template: merge_configs:
src: roles/ceph/templates/ceph.conf.j2 vars:
service_name: "{{ item }}"
sources:
- "{{ role_path }}/../ceph/templates/ceph.conf.j2"
- "{{ node_custom_config }}/ceph.conf"
- "{{ node_custom_config }}/ceph/{{ inventory_hostname }}/ceph.conf"
dest: "{{ node_config_directory }}/{{ item }}/ceph.conf" dest: "{{ node_config_directory }}/{{ item }}/ceph.conf"
with_items: with_items:
- "nova-compute" - "nova-compute"