mirror of https://github.com/k3s-io/k3s
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.pull/6/head
parent
ceaddc0c44
commit
2da59a2f34
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue