summaryrefslogtreecommitdiffstats
path: root/roles/docker
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-03-17 13:24:39 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-03-17 13:24:39 -0400
commitdf453bc226f92f3c68c82d290226dc0efc2417be (patch)
tree46f3a628edd93350b3ed889da37ae11c29140ba0 /roles/docker
parent3dbcb72f88b951247f1eb999bcf7f36df902de8e (diff)
parentbc114a192e2682204aa237fb7d69009ddfa5b747 (diff)
downloadopenshift-df453bc226f92f3c68c82d290226dc0efc2417be.tar.gz
openshift-df453bc226f92f3c68c82d290226dc0efc2417be.tar.bz2
openshift-df453bc226f92f3c68c82d290226dc0efc2417be.tar.xz
openshift-df453bc226f92f3c68c82d290226dc0efc2417be.zip
Merge pull request #1614 from detiber/bz1317755
Bug 1317755 - Set insecure-registry for internal registry by default
Diffstat (limited to 'roles/docker')
-rw-r--r--roles/docker/handlers/main.yml2
-rw-r--r--roles/docker/tasks/main.yml2
2 files changed, 3 insertions, 1 deletions
diff --git a/roles/docker/handlers/main.yml b/roles/docker/handlers/main.yml
index 9f827417f..aff905bc8 100644
--- a/roles/docker/handlers/main.yml
+++ b/roles/docker/handlers/main.yml
@@ -4,7 +4,7 @@
service:
name: docker
state: restarted
- when: not docker_service_status_changed | default(false)
+ when: not docker_service_status_changed | default(false) | bool
- name: restart udev
service:
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index ccbe1d5d5..9709c5014 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -76,3 +76,5 @@
when: docker_check.stat.isreg
notify:
- restart docker
+
+- meta: flush_handlers