diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-20 14:45:42 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-20 15:33:18 -0300 |
| commit | 8c9ed6719bdbc0ce7574fa9261c60e4978c203e6 (patch) | |
| tree | 5f5ca2bfe19fdb0363f1d8fc57bc8ae2cf24296f /roles/openshift_docker_facts | |
| parent | 4966c635ed19154cace877fcd2b613c798faa7f8 (diff) | |
| download | openshift-8c9ed6719bdbc0ce7574fa9261c60e4978c203e6.tar.gz openshift-8c9ed6719bdbc0ce7574fa9261c60e4978c203e6.tar.bz2 openshift-8c9ed6719bdbc0ce7574fa9261c60e4978c203e6.tar.xz openshift-8c9ed6719bdbc0ce7574fa9261c60e4978c203e6.zip | |
Fix docker restarts during openshift_version role.
The variable here must be explicitly passed to the docker role, if it's
passed sometimes and not others, the docker config changes triggers a
docker restart effectively killing everything on the node in an unsafe
manner.
Instead lets make sure the value is set.
Diffstat (limited to 'roles/openshift_docker_facts')
| -rw-r--r-- | roles/openshift_docker_facts/tasks/main.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/roles/openshift_docker_facts/tasks/main.yml b/roles/openshift_docker_facts/tasks/main.yml index 2e68809ca..eb8b5e99b 100644 --- a/roles/openshift_docker_facts/tasks/main.yml +++ b/roles/openshift_docker_facts/tasks/main.yml @@ -34,7 +34,8 @@ - set_fact: docker_options: "--insecure-registry={{ openshift.docker.hosted_registry_network }} {{ openshift.docker.options | default ('') }}" when: openshift.docker.hosted_registry_insecure | default(False) | bool and openshift.docker.hosted_registry_network is defined + register: hosted_registry_options - set_fact: docker_options: "{{ openshift.docker.options | default(omit) }}" - when: not openshift.docker.hosted_registry_insecure | default(False) | bool + when: hosted_registry_options | skipped |