]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
container-common: Enable docker on boot for ubuntu
authorDimitri Savineau <dsavinea@redhat.com>
Mon, 1 Apr 2019 16:12:52 +0000 (12:12 -0400)
committerGuillaume Abrioux <gabrioux@redhat.com>
Tue, 9 Apr 2019 14:50:10 +0000 (16:50 +0200)
docker daemon is automatically started during package installation
but the service isn't enabled on boot.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
roles/ceph-container-common/tasks/pre_requisites/prerequisites.yml

index cb8f29860c7a08753137b9e1ebb90ef0d2b0b9a9..c6d83f873f1afb74e0c71d10e6569b87edf71951 100644 (file)
           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'
           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