Mirrors/geerlingguy.ansible-role-docker
1
0
Fork 0
mirror of https://github.com/geerlingguy/ansible-role-docker.git synced 2024-11-23 19:06:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #80 from gebn/issue-79

Browse Source 
Remove docker_restart_on_package_change option to correct warning; fixes #79
This commit is contained in:
Jeff Geerling 2018-07-25 14:56:46 -05:00 committed by GitHub
commit 5f89170809
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -17,11 +17,7 @@ Available variables are listed below, along with default values (see `defaults/m
docker_package: "docker-{{ docker_edition }}" docker_package: "docker-{{ docker_edition }}"
docker_package_state: present docker_package_state: present
The `docker_edition` should be either `ce` (Community Edition) or `ee` (Enterprise Edition). You can also specify a specific version of Docker to install using a format like `docker-{{ docker_edition }}-<VERSION>`. And you can control whether the package is installed, uninstalled, or at the latest version by setting `docker_package_state` to `present`, `absent`, or `latest`, respectively. The `docker_edition` should be either `ce` (Community Edition) or `ee` (Enterprise Edition). You can also specify a specific version of Docker to install using a format like `docker-{{ docker_edition }}-<VERSION>`. And you can control whether the package is installed, uninstalled, or at the latest version by setting `docker_package_state` to `present`, `absent`, or `latest`, respectively. Note that the Docker daemon will be automatically restarted if the Docker package is updated. This is a side effect of flushing all handlers (running any of the handlers that have been notified by this and any other role up to this point in the play).
docker_restart_on_package_change: True
Whether to restart the Docker daemon after the Docker package is installed or updated. If this is set to `True`, this role will flush all handlers (run any of the handlers that have been notified by this and any other role up to this point in the play). The default setting helps avoid firewall clashes with Docker rules (e.g. when using custom `iptables` rules or the `geerlingguy.firewall` Ansible role).
docker_service_state: started docker_service_state: started
docker_service_enabled: yes docker_service_enabled: yes

1
defaults/main.yml
View File

@ -3,7 +3,6 @@
docker_edition: 'ce' docker_edition: 'ce'
docker_package: "docker-{{ docker_edition }}" docker_package: "docker-{{ docker_edition }}"
docker_package_state: present docker_package_state: present
docker_restart_on_package_change: True
# Service options. # Service options.
docker_service_state: started docker_service_state: started

1
tasks/main.yml
View File

@ -19,7 +19,6 @@
- name: Ensure handlers are notified now to avoid firewall conflicts. - name: Ensure handlers are notified now to avoid firewall conflicts.
meta: flush_handlers meta: flush_handlers
when: docker_restart_on_package_change
- include_tasks: docker-compose.yml - include_tasks: docker-compose.yml
when: docker_install_compose when: docker_install_compose