config: support num_osds fact setting in containerized deployment

This part of the code must be supported in containerized deployment

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1664112

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/3559/head
Guillaume Abrioux 2019-01-31 00:07:30 +01:00 committed by mergify[bot]
parent c0ad91957c
commit fe1528adb4
1 changed files with 66 additions and 62 deletions

View File

@ -1,15 +1,5 @@
--- ---
# ceph-common
- block: - block:
- name: create ceph conf directory
file:
path: "/etc/ceph"
state: directory
owner: "ceph"
group: "ceph"
mode: "0755"
- block:
- name: count number of osds for ceph-disk scenarios - name: count number of osds for ceph-disk scenarios
set_fact: set_fact:
num_osds: "{{ devices | length | int }}" num_osds: "{{ devices | length | int }}"
@ -37,6 +27,8 @@
register: lvm_batch_report register: lvm_batch_report
environment: environment:
CEPH_VOLUME_DEBUG: 1 CEPH_VOLUME_DEBUG: 1
CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
CEPH_CONTAINER_BINARY: "{{ container_binary }}"
when: when:
- devices | default([]) | length > 0 - devices | default([]) | length > 0
- osd_scenario == 'lvm' - osd_scenario == 'lvm'
@ -55,6 +47,8 @@
register: lvm_list register: lvm_list
environment: environment:
CEPH_VOLUME_DEBUG: 1 CEPH_VOLUME_DEBUG: 1
CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
CEPH_CONTAINER_BINARY: "{{ container_binary }}"
when: when:
- devices | default([]) | length > 0 - devices | default([]) | length > 0
- osd_scenario == 'lvm' - osd_scenario == 'lvm'
@ -71,6 +65,16 @@
when: when:
- inventory_hostname in groups.get(osd_group_name, []) - inventory_hostname in groups.get(osd_group_name, [])
# ceph-common
- block:
- name: create ceph conf directory
file:
path: "/etc/ceph"
state: directory
owner: "ceph"
group: "ceph"
mode: "0755"
- name: "generate ceph configuration file: {{ cluster }}.conf" - name: "generate ceph configuration file: {{ cluster }}.conf"
action: config_template action: config_template
args: args: