osd: support removing ec_profiles

Take `state` as a parameter to be passed to the module call so it is
possible to remove an ec profile.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 18e56274689a3b227c363a6a7d041e3aaef9567b..8995dc70402c6a44d92dd80b9f0ad83bc3a04206 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -370,6 +370,7 @@ dummy:
 # ec_profiles:
 #   - {'name': 'my_ec_profile1', 'k': 2, 'm': 4, 'stripe_unit': 8192}
 #   - {'name': 'my_ec_profile2', 'k': 4, 'm': 8, 'crush_root': 'HDD', 'crush_device_class': 'ssd'}
+#   - {'name': 'foobar', 'state': 'absent'}
 
 ## MDS options
 #

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 61208f844bb274373f264aa45c8379751e659501..5686ae36bc09c6051c023977514253e363656e70 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -370,6 +370,7 @@ ceph_iscsi_config_dev: false
 # ec_profiles:
 #   - {'name': 'my_ec_profile1', 'k': 2, 'm': 4, 'stripe_unit': 8192}
 #   - {'name': 'my_ec_profile2', 'k': 4, 'm': 8, 'crush_root': 'HDD', 'crush_device_class': 'ssd'}
+#   - {'name': 'foobar', 'state': 'absent'}
 
 ## MDS options
 #

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 1d2b3f913b8ff2039136a5f91fa2313b5dac865b..d9c0bbb374b54ed15b854df915ef9efb50c3c8c2 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -362,6 +362,7 @@ filestore_xattr_use_omap: null
 # ec_profiles:
 #   - {'name': 'my_ec_profile1', 'k': 2, 'm': 4, 'stripe_unit': 8192}
 #   - {'name': 'my_ec_profile2', 'k': 4, 'm': 8, 'crush_root': 'HDD', 'crush_device_class': 'ssd'}
+#   - {'name': 'foobar', 'state': 'absent'}
 
 ## MDS options
 #

diff --git a/roles/ceph-osd/tasks/main.yml b/roles/ceph-osd/tasks/main.yml
index 67bd449d47a940d551c5bea9836ab2000ee002a8..bab0d94b0204c72baedccacb15ae226ad7711f9a 100644 (file)
--- a/roles/ceph-osd/tasks/main.yml
+++ b/roles/ceph-osd/tasks/main.yml
@@ -108,7 +108,7 @@
   ceph_ec_profile:
     cluster: "{{ cluster }}"
     name: "{{ item.name }}"
-    state: present
+    state: "{{ item.state | default(omit) }}"
     stripe_unit: "{{ item.stripe_unit | default(omit) }}"
     k: "{{ item.k }}"
     m: "{{ item.m }}"