Skip to content

Commit

Permalink
Fixes #131
Browse files Browse the repository at this point in the history
  • Loading branch information
haxorof committed Nov 7, 2020
1 parent 5e9f51e commit 889da07
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 8 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased](../../releases/tag/X.Y.Z)

### Fixed

- Centos8: Issues when trying to install plugins ([#131](../../issues/131))

## [3.1.1](../../releases/tag/3.1.1) - 2020-10-23

### Fixed
Expand Down
18 changes: 14 additions & 4 deletions tasks/configure-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,20 @@
when:
- docker_daemon_config_file is not defined
- docker_daemon_config is defined
- ansible_facts.services['docker'] is not defined or
(ansible_facts.services['docker'] is defined and
ansible_facts.services['docker'].state is defined and
ansible_facts.services['docker'].state != "running")
- (
ansible_facts.services['docker'] is not defined and
ansible_facts.services['docker.service'] is not defined
) or
(
ansible_facts.services['docker'] is defined and
ansible_facts.services['docker'].state is defined and
ansible_facts.services['docker'].state != "running"
) or
(
ansible_facts.services['docker.service'] is defined and
ansible_facts.services['docker.service'].state is defined and
ansible_facts.services['docker.service'].state != "running"
)

- name: Ensure Docker default user namespace is defined in subuid and subgid
become: true
Expand Down
14 changes: 10 additions & 4 deletions tasks/configure-docker/configure-docker-plugins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,16 @@
service:
name: docker
state: started
when:
- ansible_facts.services['docker'] is defined
- ansible_facts.services['docker'].state is defined
- ansible_facts.services['docker'].state != "running"
when: (
ansible_facts.services['docker'] is defined and
ansible_facts.services['docker'].state is defined and
ansible_facts.services['docker'].state != "running"
) or
(
ansible_facts.services['docker.service'] is defined and
ansible_facts.services['docker.service'].state is defined and
ansible_facts.services['docker.service'].state != "running"
)

- name: Wait for Docker daemon to started
become: yes
Expand Down

0 comments on commit 889da07

Please sign in to comment.