Merge pull request #10601 from marun/docker-pkg-f22

Auto commit by PR queue bot

cluster/saltbase/salt/docker/init.sls

@@ -9,10 +9,6 @@ bridge-utils:
 
 {% if grains.os_family == 'RedHat' %}
 
-docker-io:
-  pkg:
-    - installed
-
 {{ environment_file }}:
   file.managed:
     - source: salt://docker/default
@@ -22,6 +18,25 @@ docker-io:
     - mode: 644
     - makedirs: true
 
+{% if grains.os == 'Fedora' and grains.osrelease_info[0] >= 22 %}
+
+docker:
+  pkg:
+    - installed
+  service.running:
+    - enable: True
+    - require:
+      - pkg: docker
+    - watch:
+      - file: {{ environment_file }}
+      - pkg: docker
+
+{% else %}
+
+docker-io:
+  pkg:
+    - installed
+
 docker:
   service.running:
     - enable: True
@@ -31,6 +46,8 @@ docker:
       - file: {{ environment_file }}
       - pkg: docker-io
 
+{% endif %}
+
 {% else %}
 
 {% if grains.cloud is defined