summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2018-01-24 12:43:20 -0500
committerScott Dodson <sdodson@redhat.com>2018-01-24 12:44:37 -0500
commitdc6173e7bfa4170106b558b124c54ff26cdc8228 (patch)
treecb43b9389db46de5d9e4b1dbbb8731b0d561a8a7
parent0344a8f71af49cdf3827ccf6be339097369c12f7 (diff)
downloadopenshift-dc6173e7bfa4170106b558b124c54ff26cdc8228.tar.gz
openshift-dc6173e7bfa4170106b558b124c54ff26cdc8228.tar.bz2
openshift-dc6173e7bfa4170106b558b124c54ff26cdc8228.tar.xz
openshift-dc6173e7bfa4170106b558b124c54ff26cdc8228.zip
Don't restart docker when re-deploying node certificates
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1537726
-rw-r--r--playbooks/openshift-node/private/restart.yml1
-rw-r--r--playbooks/openshift-node/redeploy-certificates.yml2
2 files changed, 3 insertions, 0 deletions
diff --git a/playbooks/openshift-node/private/restart.yml b/playbooks/openshift-node/private/restart.yml
index 7249ced70..7371bd7ac 100644
--- a/playbooks/openshift-node/private/restart.yml
+++ b/playbooks/openshift-node/private/restart.yml
@@ -16,6 +16,7 @@
until: not (l_docker_restart_docker_in_node_result is failed)
retries: 3
delay: 30
+ when: openshift_node_restart_docker_required | default(True)
- name: Restart containerized services
service:
diff --git a/playbooks/openshift-node/redeploy-certificates.yml b/playbooks/openshift-node/redeploy-certificates.yml
index 8b7272485..cdf816fbf 100644
--- a/playbooks/openshift-node/redeploy-certificates.yml
+++ b/playbooks/openshift-node/redeploy-certificates.yml
@@ -4,3 +4,5 @@
- import_playbook: private/redeploy-certificates.yml
- import_playbook: private/restart.yml
+ vars:
+ openshift_node_restart_docker_required: False