Merge pull request #20704 from FujitsuEnablingSoftwareTechnologyGmbH/centos-support

Auto commit by PR queue bot

Merge pull request #20704 from FujitsuEnablingSoftwareTechnologyGmbH/centos-support
e629ee6b · k8s-merge-robot · 51a29ddd · 82be3d08 · e629ee6b
Commit e629ee6b authored Feb 22, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

init.sls cluster/saltbase/salt/docker/init.sls +1 -1

No files found.
--- a/cluster/saltbase/salt/docker/init.sls
+++ b/cluster/saltbase/salt/docker/init.sls
@@ -18,7 +18,7 @@ bridge-utils:
    - mode: 644
    - makedirs: true

-{% if grains.os == 'Fedora' and grains.osrelease_info[0] >= 22 %}
+{% if (grains.os == 'Fedora' and grains.osrelease_info[0] >= 22) or (grains.os == 'CentOS' and grains.osrelease_info[0] >= 7) %}

 docker:
  pkg: