diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-12-04 16:39:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-04 16:39:04 -0500 |
| commit | 5a7b6beed127607f75a6c1128152da89ce01eca7 (patch) | |
| tree | 122851390956763876b9028ff976cd225c9f5264 /roles/openshift_node_certificates | |
| parent | 411235245c903be9e12790444f2f4cfae5ca7ef0 (diff) | |
| parent | 5120f8e90c0178ac7f6d911159ceb278dd87b4c9 (diff) | |
| download | openshift-5a7b6beed127607f75a6c1128152da89ce01eca7.tar.gz openshift-5a7b6beed127607f75a6c1128152da89ce01eca7.tar.bz2 openshift-5a7b6beed127607f75a6c1128152da89ce01eca7.tar.xz openshift-5a7b6beed127607f75a6c1128152da89ce01eca7.zip | |
Merge pull request #6297 from mgugino-upstream-stage/crt_role
Implement container runtime role
Diffstat (limited to 'roles/openshift_node_certificates')
| -rw-r--r-- | roles/openshift_node_certificates/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_node_certificates/handlers/main.yml | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/roles/openshift_node_certificates/defaults/main.yml b/roles/openshift_node_certificates/defaults/main.yml index 455f26f30..b42b75be9 100644 --- a/roles/openshift_node_certificates/defaults/main.yml +++ b/roles/openshift_node_certificates/defaults/main.yml @@ -1,3 +1,5 @@ --- openshift_node_cert_expire_days: 730 openshift_ca_host: '' + +openshift_docker_service_name: "{{ 'container-engine' if (openshift_docker_use_system_container | default(False)) else 'docker' }}" diff --git a/roles/openshift_node_certificates/handlers/main.yml b/roles/openshift_node_certificates/handlers/main.yml index ef66bf9ca..0686ac101 100644 --- a/roles/openshift_node_certificates/handlers/main.yml +++ b/roles/openshift_node_certificates/handlers/main.yml @@ -6,7 +6,7 @@ - name: check for container runtime after updating ca trust command: > - systemctl -q is-active {{ openshift.docker.service_name }}.service + systemctl -q is-active {{ openshift_docker_service_name }}.service register: l_docker_installed # An rc of 0 indicates that the container runtime service is # running. We will restart it by notifying the restart handler since @@ -18,7 +18,7 @@ - name: restart container runtime after updating ca trust systemd: - name: "{{ openshift.docker.service_name }}" + name: "{{ openshift_docker_service_name }}" state: restarted when: not openshift_certificates_redeploy | default(false) | bool register: l_docker_restart_docker_in_cert_result |