kernel.sls is only valid for Debian family

saltstack-formulas · Jul 21, 2018 · a905257 · a905257
1 parent 3652849
commit a905257
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 36 deletions.
diff --git a/docker/init.sls b/docker/init.sls
@@ -40,38 +40,6 @@ docker package:
       {%- endif %}
     - require_in:
 
-# docker package:
-#   pkg.installed:
-#     {%- if grains["oscodename"]|lower == 'jessie' %}
-#     - name: docker.io
-#     - fromrepo: {{ docker.kernel.pkg.fromrepo }}
-#     {%- elif use_old_repo is defined %}
-#     - name: lxc-docker
-#     {%- else %}
-#       {%- if grains['os']|lower in ('amazon', 'fedora', 'suse',) %}
-#     - name: docker
-#       {%- else %}
-#     - name: docker-engine
-#       {%- endif %}
-#     {%- endif %}
-#     - refresh: {{ docker.refresh_repo }}
-#     - require:
-#       - pkg: docker package dependencies
-#       {%- if grains['os']|lower not in ('amazon', 'fedora', 'suse',) %}
-#       - pkgrepo: docker package repository
-#       {%- endif %}
-#     - require_in:
-#       - file: docker-config
-#     - allow_updates: {{ docker.pkg.allow_updates }}
-#       {% if docker.pkg.version %}
-#     - version: {{ docker.pkg.version }}
-#       {% elif "version" in docker %}
-#     - version: {{ docker.version }}
-#       {% endif %}
-#       {% if docker.pkg.hold %}
-#     - hold: {{ docker.pkg.hold }}
-#       {% endif %}
-
 docker-config:
   file.managed:
     - name: {{ docker.configfile }}

diff --git a/docker/kernel.sls b/docker/kernel.sls
@@ -1,6 +1,6 @@
 {% from "docker/map.jinja" import docker with context %}
 
-{%- if docker.kernel is defined %}
+{%- if docker.kernel is defined and grains['os_family']|lower == 'debian' %}
 pkgrepo dependencies:
   pkg.installed:
     - name: python-apt

diff --git a/docker/repo.sls b/docker/repo.sls
@@ -12,7 +12,7 @@
 
 docker package repository:
   pkgrepo.{{ repo_state }}:
-    - humanname: {{ grains["os"] }} {{ grains["oscodename"]|capitalize }} Docker Package Repository
+    - humanname: {{ grains["os"] }} {{ grains["oscodename"]|capitalize }} {{ humanname_old }}Docker Package Repository
     - name: deb {{ url }}
     - file: {{ docker.repo.file }}
     {% if docker.use_old_repo %}
@@ -33,14 +33,14 @@ docker package repository:
 docker package repository:
   pkgrepo.{{ repo_state }}:
     - name: docker-ce-stable
-    - humanname: {{ grains['os'] }} {{ grains["oscodename"]|capitalize }} Docker Package Repository
+    - humanname: {{ grains['os'] }} {{ grains["oscodename"]|capitalize }} {{ humanname_old }}Docker Package Repository
     - baseurl: {{ url }}
     - enabled: 1
     - gpgcheck: 1
     {% if docker.use_old_repo %}
     - gpgkey: https://yum.dockerproject.org/gpg
     {% else %}
-    - key_url: {{ docker.repo.key_url }}
+    - gpgkey: {{ docker.repo.key_url }}
     {% endif %}
     - require_in:
       - pkg: docker package