Switch to ceph-ansible stable-8.0
This patch includes the openstack specific pool configuration that previously was in ceph-ansible, and also adds a playbook to configure ceph pools and distribute the keys to all monitor hosts. Co-Authored-By: Damian Dabrowski <damian.dabrowski@cleura.com> Change-Id: Ic55daf6ba7fdb47525ee1913f70e87296383866d
This commit is contained in:
parent
a9ec856858
commit
120d6be992
19
releasenotes/notes/ceph-ansible-8-3923428844537c1b.yaml
Normal file
19
releasenotes/notes/ceph-ansible-8-3923428844537c1b.yaml
Normal file
@ -0,0 +1,19 @@
|
||||
---
|
||||
features:
|
||||
- |
|
||||
The external dependancy ceph-ansible is upgraded to version 8.0 and
|
||||
brings in significant changes within the ceph-ansible project. Deployers
|
||||
using OpenStack-Ansible are reminded that the ceph-ansible integration
|
||||
with OSA is primarily a test fixture and production deployments should
|
||||
ideally deploy an independant ceph cluster. The upgrade between releases
|
||||
of ceph-ansible is not tested by the OpenStack-Ansible project.
|
||||
upgrade:
|
||||
- |
|
||||
The external dependancy ceph-ansible is upgraded to version 8.0 and
|
||||
brings in significant changes within the ceph-ansible project.
|
||||
Any deployments with important data held in a ceph cluster deployed
|
||||
using the OpenStack-Ansible integration with ceph-ansible should
|
||||
independantly verify that upstream changes in ceph-ansible result
|
||||
in a successful upgrade. This could undertaken in a test or staging
|
||||
environment. The upgrade between releases of ceph-ansible is not
|
||||
tested by the OpenStack-Ansible project.
|
@ -333,6 +333,6 @@
|
||||
- name: ceph-ansible
|
||||
scm: git
|
||||
src: https://github.com/ceph/ceph-ansible
|
||||
version: stable-7.0
|
||||
trackbranch: stable-7.0
|
||||
version: stable-8.0
|
||||
trackbranch: stable-8.0
|
||||
shallow_since: '2024-05-15'
|
||||
|
@ -1,8 +1,9 @@
|
||||
---
|
||||
ceph_rgw_client_name: "client.rgw.{{ rgw_zone | default('default') }}.{{ hostvars[inventory_hostname]['ansible_facts']['hostname']}}.rgw0"
|
||||
ceph_conf_overrides_rgw: |-
|
||||
{{
|
||||
{
|
||||
'client.rgw.' ~ hostvars[inventory_hostname]['ansible_facts']['hostname'] ~ '.rgw0': {
|
||||
ceph_rgw_client_name: {
|
||||
'rgw_keystone_url': keystone_service_adminuri,
|
||||
'rgw_keystone_api_version': 3,
|
||||
'rgw_keystone_admin_user': radosgw_admin_user,
|
||||
|
@ -47,3 +47,33 @@ libntirpc_stable_deb_repo: http://ppa.launchpad.net/nfs-ganesha/libntirpc-5/ubun
|
||||
ntp_service_enabled: False
|
||||
|
||||
dashboard_enabled: True
|
||||
|
||||
openstack_glance_pool:
|
||||
name: "images"
|
||||
application: "rbd"
|
||||
openstack_cinder_pool:
|
||||
name: "volumes"
|
||||
application: "rbd"
|
||||
openstack_nova_pool:
|
||||
name: "vms"
|
||||
application: "rbd"
|
||||
openstack_cinder_backup_pool:
|
||||
name: "backups"
|
||||
application: "rbd"
|
||||
openstack_gnocchi_pool:
|
||||
name: "metrics"
|
||||
application: "rbd"
|
||||
openstack_cephfs_data_pool:
|
||||
name: "manila_data"
|
||||
application: "cephfs"
|
||||
openstack_cephfs_metadata_pool:
|
||||
name: "manila_metadata"
|
||||
application: "cephfs"
|
||||
openstack_pools:
|
||||
- "{{ openstack_glance_pool }}"
|
||||
- "{{ openstack_cinder_pool }}"
|
||||
- "{{ openstack_nova_pool }}"
|
||||
- "{{ openstack_cinder_backup_pool }}"
|
||||
- "{{ openstack_gnocchi_pool }}"
|
||||
- "{{ openstack_cephfs_data_pool }}"
|
||||
- "{{ openstack_cephfs_metadata_pool }}"
|
||||
|
@ -15,7 +15,11 @@
|
||||
|
||||
- name: Gather ceph-mon facts
|
||||
hosts: ceph-mon
|
||||
gather_facts: "{{ osa_gather_facts | default(True) }}"
|
||||
gather_facts: false
|
||||
tasks:
|
||||
- name: Refresh all_addresses facts
|
||||
setup:
|
||||
gather_subset: "all_ipv4_addresses,all_ipv6_addresses"
|
||||
tags:
|
||||
- always
|
||||
|
||||
|
61
playbooks/ceph-pools.yml
Normal file
61
playbooks/ceph-pools.yml
Normal file
@ -0,0 +1,61 @@
|
||||
- name: Create ceph pools
|
||||
hosts: "{{ groups['ceph-mon'][0] | default([]) }}"
|
||||
user: root
|
||||
gather_facts: false
|
||||
vars:
|
||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
||||
vars_files:
|
||||
- "defaults/{{ install_method }}_install.yml"
|
||||
roles:
|
||||
- role: ceph-defaults
|
||||
tags:
|
||||
- skip_ansible_lint
|
||||
tasks:
|
||||
- name: Create openstack pool(s)
|
||||
ceph_pool:
|
||||
name: "{{ item.name }}"
|
||||
cluster: "{{ cluster }}"
|
||||
pg_num: "{{ item.pg_num | default(omit) }}"
|
||||
pgp_num: "{{ item.pgp_num | default(omit) }}"
|
||||
size: "{{ item.size | default(omit) }}"
|
||||
min_size: "{{ item.min_size | default(omit) }}"
|
||||
pool_type: "{{ item.type | default('replicated') }}"
|
||||
rule_name: "{{ item.rule_name | default(omit) }}"
|
||||
erasure_profile: "{{ item.erasure_profile | default(omit) }}"
|
||||
pg_autoscale_mode: "{{ item.pg_autoscale_mode | default(omit) }}"
|
||||
target_size_ratio: "{{ item.target_size_ratio | default(omit) }}"
|
||||
application: "{{ item.application | default(omit) }}"
|
||||
with_items: "{{ openstack_pools }}"
|
||||
|
||||
- name: Generate keys
|
||||
ceph_key:
|
||||
name: "{{ item.name }}"
|
||||
caps: "{{ item.caps }}"
|
||||
secret: "{{ item.key | default('') }}"
|
||||
cluster: "{{ cluster }}"
|
||||
mode: "{{ item.mode | default(ceph_keyring_permissions) }}"
|
||||
with_items: "{{ openstack_keys }}"
|
||||
no_log: "{{ no_log_on_ceph_key_tasks }}"
|
||||
|
||||
- name: Get keys from monitors
|
||||
ceph_key:
|
||||
name: "{{ item.name }}"
|
||||
cluster: "{{ cluster }}"
|
||||
output_format: plain
|
||||
state: info
|
||||
register: _osp_keys
|
||||
with_items: "{{ openstack_keys }}"
|
||||
no_log: "{{ no_log_on_ceph_key_tasks }}"
|
||||
|
||||
- name: Distribute ceph keys to all mons
|
||||
ansible.builtin.copy:
|
||||
dest: "/etc/ceph/{{ cluster }}.{{ item.0.item.name }}.keyring"
|
||||
content: "{{ item.0.stdout + '\n' }}"
|
||||
owner: 'ceph'
|
||||
group: 'ceph'
|
||||
mode: "{{ item.0.item.mode | default(ceph_keyring_permissions) }}"
|
||||
with_nested:
|
||||
- "{{ _osp_keys.results }}"
|
||||
- "{{ groups['ceph-mon'] }}"
|
||||
delegate_to: "{{ item.1 }}"
|
||||
no_log: "{{ no_log_on_ceph_key_tasks }}"
|
@ -46,6 +46,9 @@
|
||||
- name: Importing ceph-install playbook
|
||||
import_playbook: ceph-install.yml
|
||||
|
||||
- name: Importing ceph-pools playbook
|
||||
import_playbook: ceph-pools.yml
|
||||
|
||||
- name: Importing ceph-nfs-install playbook
|
||||
import_playbook: ceph-nfs-install.yml
|
||||
|
||||
|
@ -15,7 +15,6 @@
|
||||
|
||||
## ceph-ansible AIO settings
|
||||
is_hci: true
|
||||
common_single_host_mode: true
|
||||
monitor_interface: "{{ ('metal' in bootstrap_host_scenarios_expanded) | ternary('br-storage', 'eth2') }}" # Storage network in the AIO
|
||||
public_network: "{{ (storage_range ~ '.0/' ~ netmask) | ansible.utils.ipaddr('net') }}"
|
||||
journal_size: 100
|
||||
@ -23,6 +22,7 @@ osd_scenario: collocated
|
||||
ceph_conf_overrides_custom:
|
||||
global:
|
||||
mon_max_pg_per_osd: 500
|
||||
osd_crush_chooseleaf_type: 0
|
||||
openstack_config: true # Ceph ansible automatically creates pools & keys
|
||||
cinder_default_volume_type: aio_ceph
|
||||
glance_ceph_client: glance
|
||||
|
Loading…
Reference in New Issue
Block a user