diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-02-01 21:53:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-01 21:53:06 -0500 |
| commit | 55b91ccaa38d759829327589fbaa27ad12d7fd26 (patch) | |
| tree | 19b84ecc15d3fb6f2fd140076da2f8dcead4b94f /playbooks/openshift-node | |
| parent | fbdfa66f06abd8c026c1c14e292505c002d46dfe (diff) | |
| parent | dc6173e7bfa4170106b558b124c54ff26cdc8228 (diff) | |
| download | openshift-55b91ccaa38d759829327589fbaa27ad12d7fd26.tar.gz openshift-55b91ccaa38d759829327589fbaa27ad12d7fd26.tar.bz2 openshift-55b91ccaa38d759829327589fbaa27ad12d7fd26.tar.xz openshift-55b91ccaa38d759829327589fbaa27ad12d7fd26.zip | |
Merge pull request #6855 from sdodson/bz1537726-master
Don't restart docker when re-deploying node certificates
Diffstat (limited to 'playbooks/openshift-node')
| -rw-r--r-- | playbooks/openshift-node/private/restart.yml | 1 | ||||
| -rw-r--r-- | playbooks/openshift-node/redeploy-certificates.yml | 2 |
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 |