diff options
author | Michael Gugino <mgugino@redhat.com> | 2017-11-16 14:56:14 -0500 |
---|---|---|
committer | Michael Gugino <mgugino@redhat.com> | 2017-12-01 12:32:39 -0500 |
commit | 5120f8e90c0178ac7f6d911159ceb278dd87b4c9 (patch) | |
tree | 1b1f51b242c259e659e1e09c439504b33d33f0c1 /roles/calico | |
parent | e0e10698184c9a7cf4bf65787771686e46d26603 (diff) | |
download | openshift-5120f8e90c0178ac7f6d911159ceb278dd87b4c9.tar.gz openshift-5120f8e90c0178ac7f6d911159ceb278dd87b4c9.tar.bz2 openshift-5120f8e90c0178ac7f6d911159ceb278dd87b4c9.tar.xz openshift-5120f8e90c0178ac7f6d911159ceb278dd87b4c9.zip |
Implement container runtime role
Diffstat (limited to 'roles/calico')
-rw-r--r-- | roles/calico/handlers/main.yml | 4 | ||||
-rw-r--r-- | roles/calico/templates/calico.service.j2 | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/calico/handlers/main.yml b/roles/calico/handlers/main.yml index 67fc0065f..9cc0604a3 100644 --- a/roles/calico/handlers/main.yml +++ b/roles/calico/handlers/main.yml @@ -3,10 +3,10 @@ become: yes systemd: name=calico state=restarted -- name: restart docker +- name: restart container runtime become: yes systemd: - name: "{{ openshift.docker.service_name }}" + name: "{{ openshift_docker_service_name }}" state: restarted register: l_docker_restart_docker_in_calico_result until: not l_docker_restart_docker_in_calico_result | failed diff --git a/roles/calico/templates/calico.service.j2 b/roles/calico/templates/calico.service.j2 index 7653e19b1..a7809b9f9 100644 --- a/roles/calico/templates/calico.service.j2 +++ b/roles/calico/templates/calico.service.j2 @@ -1,7 +1,7 @@ [Unit] Description=calico -After={{ openshift.docker.service_name }}.service -Requires={{ openshift.docker.service_name }}.service +After={{ openshift_docker_service_name }}.service +Requires={{ openshift_docker_service_name }}.service [Service] Restart=always |