github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #20704 from FujitsuEnablingSoftwareTechnologyGmbH/centos-support

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-22 02:35:22 -08:00
commit e629ee6bd3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/saltbase/salt/docker/init.sls
View File

@ -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: