From 0ac43d83f478e5d45e00682a52c03d3384306cf4 Mon Sep 17 00:00:00 2001
From: Dimitri Savineau <dsavinea@redhat.com>
Date: Thu, 31 Oct 2019 16:17:33 -0400
Subject: [PATCH] move crush rule creation from mon to osd role

If we want to create crush rules with the create-replicated sub command
and device class then we need to have the OSD created before the crush
rules otherwise the device classes won't exist.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit ed36a11eabbdbb040652991300cdfc93d51ed491)
---
 roles/ceph-mon/tasks/crush_rules.yml | 60 -----------------------
 roles/ceph-mon/tasks/main.yml        |  5 --
 roles/ceph-osd/tasks/crush_rules.yml | 72 ++++++++++++++++++++++++++++
 roles/ceph-osd/tasks/main.yml        |  4 ++
 4 files changed, 76 insertions(+), 65 deletions(-)
 delete mode 100644 roles/ceph-mon/tasks/crush_rules.yml
 create mode 100644 roles/ceph-osd/tasks/crush_rules.yml

diff --git a/roles/ceph-mon/tasks/crush_rules.yml b/roles/ceph-mon/tasks/crush_rules.yml
deleted file mode 100644
index 18428ecdd..000000000
--- a/roles/ceph-mon/tasks/crush_rules.yml
+++ /dev/null
@@ -1,60 +0,0 @@
----
-- name: configure crush hierarchy
-  ceph_crush:
-    cluster: "{{ cluster }}"
-    location: "{{ hostvars[item]['osd_crush_location'] }}"
-    containerized: "{{ docker_exec_cmd }}"
-  with_items: "{{ groups[osd_group_name] }}"
-  register: config_crush_hierarchy
-  when:
-    - inventory_hostname == groups.get(mon_group_name) | last
-    - create_crush_tree
-    - hostvars[item]['osd_crush_location'] is defined
-
-- name: create configured crush rules
-  command: "{{ docker_exec_cmd }} ceph --cluster {{ cluster }} osd crush rule create-simple {{ item.name }} {{ item.root }} {{ item.type }}"
-  with_items: "{{ crush_rules | unique }}"
-  changed_when: false
-  when:
-    - inventory_hostname == groups.get(mon_group_name) | last
-
-- name: get id for new default crush rule
-  command: "{{ docker_exec_cmd }} ceph --cluster {{ cluster }} osd -f json crush rule dump {{ item.name }}"
-  register: info_ceph_default_crush_rule
-  changed_when: false
-  with_items: "{{ crush_rules }}"
-  when:
-    - inventory_hostname == groups.get(mon_group_name) | last
-    - item.default
-
-# If multiple rules are set as default (should not be) then the last one is taken as actual default.
-# the with_items statement overrides each iteration with the new one.
-# NOTE(leseb): we should actually fail if multiple rules are set as default
-- name: set_fact info_ceph_default_crush_rule_yaml
-  set_fact:
-    info_ceph_default_crush_rule_yaml: "{{ item.stdout | from_json() }}"
-  with_items: "{{ info_ceph_default_crush_rule.results }}"
-  when:
-    - inventory_hostname == groups.get(mon_group_name) | last
-    - not item.get('skipped', false)
-
-- name: insert new default crush rule into daemon to prevent restart
-  command: "{{ hostvars[item]['docker_exec_cmd'] | default('') }} ceph --cluster {{ cluster }} daemon mon.{{ hostvars[item]['monitor_name'] }} config set osd_pool_default_crush_rule {{ info_ceph_default_crush_rule_yaml.rule_id }}"
-  changed_when: false
-  delegate_to: "{{ item }}"
-  with_items: "{{ groups[mon_group_name] }}"
-  when:
-    - not config_crush_hierarchy.get('skipped', false)
-    - info_ceph_default_crush_rule_yaml | default('') | length > 0
-
-- name: "add new default crush rule to {{ cluster }}.conf"
-  ini_file:
-    dest: "/etc/ceph/{{ cluster }}.conf"
-    section: "global"
-    option: "osd pool default crush rule"
-    value: "{{ info_ceph_default_crush_rule_yaml.rule_id }}"
-  delegate_to: "{{ item }}"
-  with_items: "{{ groups[mon_group_name] }}"
-  when:
-    - not config_crush_hierarchy.get('skipped', false)
-    - info_ceph_default_crush_rule_yaml | default('') | length > 0
diff --git a/roles/ceph-mon/tasks/main.yml b/roles/ceph-mon/tasks/main.yml
index 4aa0b2739..c72c06d91 100644
--- a/roles/ceph-mon/tasks/main.yml
+++ b/roles/ceph-mon/tasks/main.yml
@@ -28,8 +28,3 @@
 - name: include docker/main.yml
   include_tasks: docker/main.yml
   when: containerized_deployment
-
-- name: crush_rules.yml
-  include_tasks: crush_rules.yml
-  when:
-    - crush_rule_config
diff --git a/roles/ceph-osd/tasks/crush_rules.yml b/roles/ceph-osd/tasks/crush_rules.yml
new file mode 100644
index 000000000..49ec01439
--- /dev/null
+++ b/roles/ceph-osd/tasks/crush_rules.yml
@@ -0,0 +1,72 @@
+---
+- name: configure crush hierarchy
+  ceph_crush:
+    cluster: "{{ cluster }}"
+    location: "{{ osd_crush_location }}"
+    containerized: "{{ hostvars[groups[mon_group_name][0]]['docker_exec_cmd'] | default('') }}"
+  register: config_crush_hierarchy
+  delegate_to: '{{ groups[mon_group_name][0] }}'
+  when:
+    - hostvars[groups[mon_group_name][0]]['create_crush_tree'] | default(false) | bool
+    - osd_crush_location is defined
+
+- name: create configured crush rules
+  command: "{{ hostvars[groups[mon_group_name][0]]['docker_exec_cmd'] | default('') }} ceph --cluster {{ cluster }} osd crush rule create-simple {{ item.name }} {{ item.root }} {{ item.type }}"
+  changed_when: false
+  with_items: "{{ hostvars[groups[mon_group_name][0]]['crush_rules'] | unique }}"
+  delegate_to: '{{ groups[mon_group_name][0] }}'
+  run_once: true
+
+- name: get id for new default crush rule
+  command: "{{ hostvars[groups[mon_group_name][0]]['docker_exec_cmd'] | default('') }} ceph --cluster {{ cluster }} osd -f json crush rule dump {{ item.name }}"
+  register: info_ceph_default_crush_rule
+  changed_when: false
+  with_items: "{{ hostvars[groups[mon_group_name][0]]['crush_rules'] | unique }}"
+  delegate_to: '{{ groups[mon_group_name][0] }}'
+  run_once: true
+  when: item.default | bool
+
+# If multiple rules are set as default (should not be) then the last one is taken as actual default.
+# the with_items statement overrides each iteration with the new one.
+# NOTE(leseb): we should actually fail if multiple rules are set as default
+- name: set_fact info_ceph_default_crush_rule_yaml
+  set_fact:
+    info_ceph_default_crush_rule_yaml: "{{ item.stdout | from_json() }}"
+  with_items: "{{ info_ceph_default_crush_rule.results }}"
+  run_once: true
+  when: not item.get('skipped', false)
+
+- name: insert new default crush rule into daemon to prevent restart (non container)
+  command: "ceph --cluster {{ cluster }} daemon mon.{{ hostvars[item]['monitor_name'] }} config set osd_pool_default_crush_rule {{ info_ceph_default_crush_rule_yaml.rule_id }}"
+  changed_when: false
+  delegate_to: "{{ item }}"
+  with_items: "{{ groups[mon_group_name] }}"
+  run_once: true
+  when:
+    - not config_crush_hierarchy.get('skipped', false)
+    - info_ceph_default_crush_rule_yaml | default('') | length > 0
+    - not containerized_deployment | bool
+
+- name: insert new default crush rule into daemon to prevent restart (container)
+  command: "docker exec ceph-mon-{{ hostvars[item]['ansible_hostname'] }} ceph --cluster {{ cluster }} daemon mon.{{ hostvars[item]['monitor_name'] }} config set osd_pool_default_crush_rule {{ info_ceph_default_crush_rule_yaml.rule_id }}"
+  changed_when: false
+  delegate_to: "{{ item }}"
+  with_items: "{{ groups[mon_group_name] }}"
+  run_once: true
+  when:
+    - not config_crush_hierarchy.get('skipped', false)
+    - info_ceph_default_crush_rule_yaml | default('') | length > 0
+    - containerized_deployment | bool
+
+- name: "add new default crush rule to {{ cluster }}.conf"
+  ini_file:
+    dest: "/etc/ceph/{{ cluster }}.conf"
+    section: "global"
+    option: "osd pool default crush rule"
+    value: "{{ info_ceph_default_crush_rule_yaml.rule_id }}"
+  delegate_to: "{{ item }}"
+  with_items: "{{ groups[mon_group_name] }}"
+  run_once: true
+  when:
+    - not config_crush_hierarchy.get('skipped', false)
+    - info_ceph_default_crush_rule_yaml | default('') | length > 0
diff --git a/roles/ceph-osd/tasks/main.yml b/roles/ceph-osd/tasks/main.yml
index 03eb43de5..c1f27cb5d 100644
--- a/roles/ceph-osd/tasks/main.yml
+++ b/roles/ceph-osd/tasks/main.yml
@@ -89,6 +89,10 @@
 - name: include_tasks start_osds.yml
   include_tasks: start_osds.yml
 
+- name: include crush_rules.yml
+  include_tasks: crush_rules.yml
+  when: hostvars[groups[mon_group_name][0]]['crush_rule_config'] | default(false) | bool
+
 - name: set_fact openstack_keys_tmp - preserve backward compatibility after the introduction of the ceph_keys module
   set_fact:
     openstack_keys_tmp: "{{ openstack_keys_tmp|default([]) + [ { 'key': item.key, 'name': item.name, 'caps': { 'mon': item.mon_cap, 'osd': item.osd_cap|default(''), 'mds': item.mds_cap|default(''), 'mgr': item.mgr_cap|default('') } , 'mode': item.mode } ] }}"
-- 
2.39.5