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 | |
| 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.
| -rw-r--r-- | playbooks/common/openshift-cluster/initialize_facts.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 2 | ||||
| -rw-r--r-- | roles/docker/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_docker_facts/tasks/main.yml | 3 |
4 files changed, 4 insertions, 4 deletions
diff --git a/playbooks/common/openshift-cluster/initialize_facts.yml b/playbooks/common/openshift-cluster/initialize_facts.yml index cda490b1f..a4af5efc5 100644 --- a/playbooks/common/openshift-cluster/initialize_facts.yml +++ b/playbooks/common/openshift-cluster/initialize_facts.yml @@ -8,3 +8,5 @@ role: common local_facts: hostname: "{{ openshift_hostname | default(None) }}" + - set_fact: + openshift_docker_hosted_registry_network: "{{ hostvars[groups.oo_first_master.0].openshift.common.portal_net }}" diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 5e57cdeef..f17f6a1e9 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -204,7 +204,6 @@ | oo_collect('openshift.common.all_hostnames') | oo_flatten | unique }}" sync_tmpdir: "{{ hostvars.localhost.g_master_mktemp.stdout }}" - openshift_docker_hosted_registry_network: "{{ hostvars[groups.oo_first_master.0].openshift.common.portal_net }}" roles: - openshift_master_certificates post_tasks: @@ -320,7 +319,6 @@ openshift_master_count: "{{ openshift.master.master_count }}" openshift_master_session_auth_secrets: "{{ hostvars[groups.oo_first_master.0].openshift.master.session_auth_secrets }}" openshift_master_session_encryption_secrets: "{{ hostvars[groups.oo_first_master.0].openshift.master.session_encryption_secrets }}" - openshift_docker_hosted_registry_network: "{{ hostvars[groups.oo_first_master.0].openshift.common.portal_net }}" openshift_no_proxy_internal_hostnames: "{{ hostvars | oo_select_keys(groups['oo_nodes_to_config'] | union(groups['oo_masters_to_config']) | union(groups['oo_etcd_to_config'] | default([]))) diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index 1b26af0dd..ed97d539c 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -1,2 +1 @@ --- -docker_version: ''
\ No newline at end of file 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 |