From 470554872fda142fe23b5d9140869af7b44dd034 Mon Sep 17 00:00:00 2001 From: George Brighton Date: Sun, 22 Jul 2018 22:13:02 +0100 Subject: [PATCH] Remove docker_restart_on_package_change option to correct warning; fixes #79 --- README.md | 6 +----- defaults/main.yml | 1 - tasks/main.yml | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/README.md b/README.md index 22ebd15..b264883 100644 --- a/README.md +++ b/README.md @@ -17,11 +17,7 @@ Available variables are listed below, along with default values (see `defaults/m docker_package: "docker-{{ docker_edition }}" 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 }}-`. 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. - - 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). +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 }}-`. 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_service_state: started docker_service_enabled: yes diff --git a/defaults/main.yml b/defaults/main.yml index caa6702..e95a1b3 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -3,7 +3,6 @@ docker_edition: 'ce' docker_package: "docker-{{ docker_edition }}" docker_package_state: present -docker_restart_on_package_change: True # Service options. docker_service_state: started diff --git a/tasks/main.yml b/tasks/main.yml index eaf71c5..8444ac7 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -19,7 +19,6 @@ - name: Ensure handlers are notified now to avoid firewall conflicts. meta: flush_handlers - when: docker_restart_on_package_change - include_tasks: docker-compose.yml when: docker_install_compose