From: Dimitri Savineau <dsavinea@redhat.com>
Date: Mon, 1 Apr 2019 16:12:52 +0000 (-0400)
Subject: container-common: Enable docker on boot for ubuntu
X-Git-Tag: v5.0.0alpha1~430
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=37816570c6204ccc37279f7120309ad31cf3f5cb;p=ceph-ansible.git

container-common: Enable docker on boot for ubuntu

docker daemon is automatically started during package installation
but the service isn't enabled on boot.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
---

diff --git a/roles/ceph-container-common/tasks/pre_requisites/prerequisites.yml b/roles/ceph-container-common/tasks/pre_requisites/prerequisites.yml
index cb8f29860..c6d83f873 100644
--- a/roles/ceph-container-common/tasks/pre_requisites/prerequisites.yml
+++ b/roles/ceph-container-common/tasks/pre_requisites/prerequisites.yml
@@ -78,14 +78,6 @@
           tags:
             with_pkg
 
-        - name: start docker service
-          service:
-            name: docker
-            state: started
-            enabled: yes
-          tags:
-            with_pkg
-
     - name: red hat 8 based systems tasks
       when:
         - ansible_distribution_major_version == '8'
@@ -99,6 +91,16 @@
           tags:
             with_pkg
 
+- name: start docker service
+  service:
+    name: docker
+    state: started
+    enabled: yes
+  tags:
+    with_pkg
+  when: not (ansible_os_family == 'RedHat' and
+             ansible_distribution_major_version == '8')
+
 - name: ensure tmpfiles.d is present
   lineinfile:
     path: /etc/tmpfiles.d/ceph-common.conf