diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-09 08:01:45 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-09 08:01:45 -0800 |
| commit | c49d85c8eb1bcb42943e0fd15a3345dd8bf2c8f2 (patch) | |
| tree | 46c5825cd67b79b6cf08be0a5a9a296212fb9aae | |
| parent | 4ac04c4d389f9b77ff67d7f624ab8df0f57c9a01 (diff) | |
| parent | 728a286eed2865bfeda3f2ab5106b945f2bdfb6d (diff) | |
| download | openshift-c49d85c8eb1bcb42943e0fd15a3345dd8bf2c8f2.tar.gz openshift-c49d85c8eb1bcb42943e0fd15a3345dd8bf2c8f2.tar.bz2 openshift-c49d85c8eb1bcb42943e0fd15a3345dd8bf2c8f2.tar.xz openshift-c49d85c8eb1bcb42943e0fd15a3345dd8bf2c8f2.zip | |
Merge pull request #6650 from vrutkovs/containerized_upgrade_set_openshift_use_openshift_sdn
Automatic merge from submit-queue.
upgrades: use openshift_node_use_openshift_sdn when trying to pre-pull the image
This affects 3.8/3.9 upgrades for containerized hosts, if nodes are separate from master.
| -rw-r--r-- | roles/openshift_node/tasks/upgrade/containerized_upgrade_pull.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_node/tasks/upgrade/containerized_upgrade_pull.yml b/roles/openshift_node/tasks/upgrade/containerized_upgrade_pull.yml index 0a14e5174..e5477f389 100644 --- a/roles/openshift_node/tasks/upgrade/containerized_upgrade_pull.yml +++ b/roles/openshift_node/tasks/upgrade/containerized_upgrade_pull.yml @@ -10,6 +10,6 @@ docker pull {{ osn_ovs_image }}:{{ openshift_image_tag }} register: pull_result changed_when: "'Downloaded newer image' in pull_result.stdout" - when: openshift_use_openshift_sdn | bool + when: openshift_node_use_openshift_sdn | bool - include_tasks: ../container_images.yml |