242625dff4
If upgrading the nova, cinder or manila services via 'kolla-ansible upgrade', the Ceph config files are not generated. Users will expect that these files are generated, to pull in any changes from their configuration or the base kolla configuration. This change moves Ceph tasks inside config.yml to ensure that they are performed during deploy, reconfigure and upgrade. This has been done for nova, cinder, gnocchi and manila - glance already does this. Change-Id: Ic75692c2bcba9b81dee922ff6fbbccd160e7fa19 Closes-Bug: #1794275
46 lines
1.3 KiB
YAML
46 lines
1.3 KiB
YAML
---
|
|
- name: Copying over ceph.conf(s)
|
|
merge_configs:
|
|
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"
|
|
become: true
|
|
when: inventory_hostname in groups[item]
|
|
with_items:
|
|
- "gnocchi-api"
|
|
- "gnocchi-metricd"
|
|
- "gnocchi-statsd"
|
|
|
|
- include_tasks: ../../ceph_pools.yml
|
|
vars:
|
|
pool_name: "{{ gnocchi_pool_name }}"
|
|
pool_type: "{{ gnocchi_pool_type }}"
|
|
cache_mode: "{{ gnocchi_cache_mode }}"
|
|
pool_pg_num: "{{ gnocchi_pool_pg_num }}"
|
|
pool_pgp_num: "{{ gnocchi_pool_pgp_num }}"
|
|
pool_application: "rgw"
|
|
|
|
- name: Pulling cephx keyring
|
|
kolla_ceph_keyring:
|
|
name: client.gnocchi
|
|
caps: "{{ ceph_client_gnocchi_keyring_caps }}"
|
|
register: cephx_key
|
|
delegate_to: "{{ groups['ceph-mon'][0] }}"
|
|
run_once: True
|
|
|
|
- name: Pushing cephx keyring
|
|
copy:
|
|
content: |
|
|
[client.gnocchi]
|
|
key = {{ cephx_key.keyring.key }}
|
|
dest: "{{ node_config_directory }}/{{ item }}/ceph.client.gnocchi.keyring"
|
|
mode: "0600"
|
|
become: true
|
|
when: inventory_hostname in groups[item]
|
|
with_items:
|
|
- "gnocchi-api"
|
|
- "gnocchi-metricd"
|
|
- "gnocchi-statsd"
|