CI: cephadm: Add osds/pools/users in one run

Change-Id: If9b40079d42cdabfd14d27603357dd0aa027a49b
This commit is contained in:
Michal Nasiadka 2022-04-06 17:16:27 +02:00 committed by Radosław Piliszek
parent bf30ed621b
commit c922d458df
3 changed files with 31 additions and 38 deletions

View File

@ -65,44 +65,19 @@
dest: "/var/run/ceph/{{ ceph_fsid }}/cluster.yml"
become: True
- name: Check Ceph Orchestrator state
command:
cmd: >
cephadm shell --
ceph orch status --detail
- name: Template out command spec
template:
src: templates/commands.sh.j2
dest: "/var/run/ceph/{{ ceph_fsid }}/commands.sh"
become: True
- name: Apply cluster spec
- name: Run commands
command:
cmd: >
cephadm shell --
ceph orch apply -i /var/run/ceph/cluster.yml
bash /var/run/ceph/commands.sh
become: True
- name: Add osds
command:
cmd: >
cephadm shell --
ceph orch daemon add osd {{ item }}
become: True
loop: "{{ cephadm_ceph_osd_devices }}"
- name: Create and initialise pools for OpenStack services
command:
cmd: >
cephadm shell --
ceph osd pool create {{ item }}
with_items: "{{ cephadm_ceph_pools }}"
become: true
- name: Create users for OpenStack services
command:
cmd: >
cephadm shell --
ceph auth get-or-create {{ item }}
become: true
with_items: "{{ cephadm_ceph_users }}"
# TODO(mnasiadka): Fix merge_configs to support tabs
- name: Generate ceph.conf without tabs
vars:
@ -112,10 +87,5 @@
mon_host = {% for host in groups['all'] %} {{ hostvars[host]['ansible_'+api_interface_name].ipv4.address }} {% if not loop.last %},{% endif %} {% endfor %}
copy:
content: "{{ ceph_conf_fixed }}"
dest: /etc/ceph/ceph.conf
become: True
- name: Check ceph health
command:
cmd: cephadm shell -- ceph health detail
dest: "/etc/ceph/ceph.conf.fixed"
become: True

View File

@ -0,0 +1,23 @@
# Status
ceph orch status --detail
# Apply cluster spec
ceph orch apply -i /var/run/ceph/cluster.yml
# OSDs
{% for osd in cephadm_ceph_osd_devices %}
ceph orch daemon add osd {{ osd }}
{% endfor %}
# Pools
{% for pool in cephadm_ceph_pools %}
ceph osd pool create {{ pool }}
{% endfor %}
# Users
{% for user in cephadm_ceph_users %}
ceph auth get-or-create {{ user }}
{% endfor %}
# Health
ceph health detail

View File

@ -364,7 +364,7 @@
- name: copy ceph.conf to enabled services
copy:
remote_src: True
src: "/etc/ceph/ceph.conf"
src: "/etc/ceph/ceph.conf.fixed"
dest: "/etc/kolla/config/{{ item.name }}/ceph.conf"
with_items: "{{ cephadm_kolla_ceph_services }}"