osd: do not enable osd@id unit file

ceph-disk is responsable for enabling the unit file if needed. Actually
since https://github.com/ceph/ceph/pull/12241 it seems that it's not
even needed. On an event of a restart, udev rules will be trigger and
they will ceph-disk activate the device too so the 'enabled' is not
needed.

Closes: https://github.com/ceph/ceph-ansible/issues/1142
Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/roles/ceph-osd/tasks/activate_osds.yml b/roles/ceph-osd/tasks/activate_osds.yml
index f35bea199eba850cff38adc11f016b07c060bd9b..4c1a1bd613135b2291ec9e0131d5da56ef558025 100644 (file)
--- a/roles/ceph-osd/tasks/activate_osds.yml
+++ b/roles/ceph-osd/tasks/activate_osds.yml
@@ -95,6 +95,5 @@
   service:
     name: ceph-osd@{{ item }}
     state: started
-    enabled: yes
   with_items: "{{ (osd_id|default({})).stdout_lines|default([]) }}"
   changed_when: false

diff --git a/tests/functional/tests/osd/test_osds.py b/tests/functional/tests/osd/test_osds.py
index e0465c40188c533c593f3307e3d73d2653fb012e..11fc226a378cbccbb9ffa8ac539bb2a431574188 100644 (file)
--- a/tests/functional/tests/osd/test_osds.py
+++ b/tests/functional/tests/osd/test_osds.py
@@ -22,11 +22,6 @@ class TestOSDs(object):
         for osd in node["osds"]:
             assert Service("ceph-osd@%s" % osd).is_running
 
-    def test_osd_services_are_enabled(self, node, Service):
-        # TODO: figure out way to paramaterize node['osds'] for this test
-        for osd in node["osds"]:
-            assert Service("ceph-osd@%s" % osd).is_enabled
-
     @pytest.mark.no_docker
     def test_osd_are_mounted(self, node, MountPoint):
         # TODO: figure out way to paramaterize node['osd_ids'] for this test