summaryrefslogtreecommitdiffstats
path: root/roles/openshift_docker
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-01-04 16:22:41 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-01-04 16:22:41 -0500
commitb733e7fb2c79c6b7423c159681eba28417cdf599 (patch)
treece5fc5656971cd05fb7aa644bcf9421d47e43f53 /roles/openshift_docker
parent4f24574a143b99a03cc23780c2b9098ed858cba0 (diff)
parentefe65a4315b9bd3fdc37be7564fc2f1cb77e1817 (diff)
downloadopenshift-b733e7fb2c79c6b7423c159681eba28417cdf599.tar.gz
openshift-b733e7fb2c79c6b7423c159681eba28417cdf599.tar.bz2
openshift-b733e7fb2c79c6b7423c159681eba28417cdf599.tar.xz
openshift-b733e7fb2c79c6b7423c159681eba28417cdf599.zip
Merge pull request #1105 from EricMountain-1A/fix-restart-docker-handler
Fix Docker restart handling
Diffstat (limited to 'roles/openshift_docker')
-rw-r--r--roles/openshift_docker/handlers/main.yml6
-rw-r--r--roles/openshift_docker/tasks/main.yml6
2 files changed, 9 insertions, 3 deletions
diff --git a/roles/openshift_docker/handlers/main.yml b/roles/openshift_docker/handlers/main.yml
new file mode 100644
index 000000000..92a6c325f
--- /dev/null
+++ b/roles/openshift_docker/handlers/main.yml
@@ -0,0 +1,6 @@
+---
+
+- name: restart openshift_docker
+ service:
+ name: docker
+ state: restarted
diff --git a/roles/openshift_docker/tasks/main.yml b/roles/openshift_docker/tasks/main.yml
index 75e782eef..5a285e773 100644
--- a/roles/openshift_docker/tasks/main.yml
+++ b/roles/openshift_docker/tasks/main.yml
@@ -18,7 +18,7 @@
- stat: path=/etc/sysconfig/docker
register: docker_check
-
+
- name: Set registry params
lineinfile:
dest: /etc/sysconfig/docker
@@ -36,7 +36,7 @@
reg_fact_val: "{{ openshift.common.docker_insecure_registries }}"
reg_flag: --insecure-registry
notify:
- - restart docker
+ - restart openshift_docker
# TODO: Enable secure registry when code available in origin
# TODO: perhaps move this to openshift_docker?
@@ -50,4 +50,4 @@
{% if openshift.node.docker_log_options is defined %} {{ openshift.node.docker_log_options | oo_split() | oo_prepend_strings_in_list('--log-opt ') | join(' ')}} {% endif %} '"
when: docker_check.stat.isreg
notify:
- - restart docker \ No newline at end of file
+ - restart openshift_docker