Install 'docker' package for Fedora 22

Fedora < 22 provides docker via the 'docker-io' package, but this package was renamed to 'docker' as of Fedora 22. Though the docker package can be installed manually with 'dnf install docker-io' on F22, Salt requires the explicit package name or deployment will fail.

Install 'docker' package for Fedora 22
2da59a2f · Maru Newby · ceaddc0c · 2da59a2f
Commit 2da59a2f authored Jun 30, 2015 by Maru Newby
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 4 deletions

init.sls cluster/saltbase/salt/docker/init.sls +21 -4

No files found.
--- a/cluster/saltbase/salt/docker/init.sls
+++ b/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