Revert "Flush fixes and adjustment to default bridge ip option" (#210)

* Revert "add var start_docker_daemon to only (re)start docker daemon if it is true (#204)"

This reverts commit f9abb68.

* Revert "Flush fixes and adjustment to default bridge ip option"

This reverts commit b5a0deb.

defaults/main.yml

@@ -56,13 +56,6 @@ docker_http_proxy:
 docker_https_proxy:
 docker_no_proxy:
 
-# Optionally allow the bridge IP to change, to prevent conflicts or allow more control
-docker_bip:
-
-# Flag to determine if we should flush handlers mid way through role. This is useful if we want docker to make use of our new
-# options right away
-docker_flush_handlers: true
-
 # Flags for whether to install pip packages
 pip_install_pip: true
 pip_install_setuptools: true

tasks/main.yml

@@ -331,19 +331,3 @@
   setup:
     filter: "ansible_docker0"
   when: ansible_docker0 is not defined
-
-- name: Add different cidr for docker bridge
-  copy:
-    content: |
-      {
-        "bip": "{{ docker_bip }}"
-      }
-    dest: /etc/docker/daemon.json
-  when: docker_bip is not none
-  notify:
-    - Restart docker
-
-# Flush handlers so things like proxy settings are picked up or new bridge ip
-- name: Force handler flush so the config is picked up
-  meta: flush_handlers
-  when: docker_flush_handlers