diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-05-09 10:20:12 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-05-09 10:20:12 -0400 |
| commit | 355252968b75c96ffb7078b92ab5fb70841267ee (patch) | |
| tree | 912c1d47338aa7f28109329adf2f9528d5282533 | |
| parent | a9bf2540412983ff65ea376eb2ed0675536dd102 (diff) | |
| parent | d4a6af44b21c1bcca1d6685edd6a03834d4b9dd2 (diff) | |
| download | openshift-355252968b75c96ffb7078b92ab5fb70841267ee.tar.gz openshift-355252968b75c96ffb7078b92ab5fb70841267ee.tar.bz2 openshift-355252968b75c96ffb7078b92ab5fb70841267ee.tar.xz openshift-355252968b75c96ffb7078b92ab5fb70841267ee.zip | |
Merge pull request #1869 from dgoodwin/upgrade-registries
Fix cli_docker_additional_registries being erased during upgrade.
| -rw-r--r-- | playbooks/byo/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml | 25 | ||||
| -rw-r--r-- | roles/docker/tasks/main.yml | 2 |
2 files changed, 26 insertions, 1 deletions
diff --git a/playbooks/byo/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml index 0c91b51d6..a929e4a6a 100644 --- a/playbooks/byo/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml +++ b/playbooks/byo/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml @@ -7,8 +7,33 @@ g_nfs_hosts: "{{ groups.nfs | default([]) }}" g_node_hosts: "{{ groups.nodes | default([]) }}" g_lb_hosts: "{{ groups.lb | default([]) }}" + g_all_hosts: "{{ groups.masters | default([]) | union(groups.nodes | default([])) | union(groups.etcd | default([])) + | union(groups.lb | default([])) | union(groups.nfs | default([])) }}" openshift_cluster_id: "{{ cluster_id | default('default') }}" openshift_deployment_type: "{{ deployment_type }}" + +- name: Set oo_options + hosts: oo_all_hosts + tasks: + - set_fact: + openshift_docker_additional_registries: "{{ lookup('oo_option', 'docker_additional_registries') }}" + when: openshift_docker_additional_registries is not defined + - set_fact: + openshift_docker_insecure_registries: "{{ lookup('oo_option', 'docker_insecure_registries') }}" + when: openshift_docker_insecure_registries is not defined + - set_fact: + openshift_docker_blocked_registries: "{{ lookup('oo_option', 'docker_blocked_registries') }}" + when: openshift_docker_blocked_registries is not defined + - set_fact: + openshift_docker_options: "{{ lookup('oo_option', 'docker_options') }}" + when: openshift_docker_options is not defined + - set_fact: + openshift_docker_log_driver: "{{ lookup('oo_option', 'docker_log_driver') }}" + when: openshift_docker_log_driver is not defined + - set_fact: + openshift_docker_log_options: "{{ lookup('oo_option', 'docker_log_options') }}" + when: openshift_docker_log_options is not defined + - include: ../../../../common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml vars: openshift_deployment_type: "{{ deployment_type }}" diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index e4a31c692..3fd2ef50c 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -69,7 +69,7 @@ reg_flag: --insecure-registry notify: - restart docker - + - name: Set Proxy Settings lineinfile: dest: /etc/sysconfig/docker |