diff options
author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-15 10:24:59 -0400 |
---|---|---|
committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-15 10:24:59 -0400 |
commit | dbb94c4e5461780adb74e864e6b0919153b5ffe7 (patch) | |
tree | a2be6d3e8f107bfea0d016d900dbd262cce98baa /playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2 | |
parent | a9893ab91495a7b5530648191291bcb9de9cd291 (diff) | |
parent | 2342cb2f47050d430ff7fb07e68e9e42006884eb (diff) | |
download | openshift-dbb94c4e5461780adb74e864e6b0919153b5ffe7.tar.gz openshift-dbb94c4e5461780adb74e864e6b0919153b5ffe7.tar.bz2 openshift-dbb94c4e5461780adb74e864e6b0919153b5ffe7.tar.xz openshift-dbb94c4e5461780adb74e864e6b0919153b5ffe7.zip |
Merge pull request #1746 from brenton/docker1
The openshift_docker role must set the version facts for containerize…
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2')
-rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml index eb12fcabe..8852bb8de 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml @@ -10,14 +10,23 @@ tasks: - include: docker_upgrade.yml when: not openshift.common.is_atomic | bool + - name: Set post docker install facts + openshift_facts: + role: "{{ item.role }}" + local_facts: "{{ item.local_facts }}" + with_items: + - role: docker + local_facts: + openshift_image_tag: "v{{ g_new_version }}" + openshift_version: "{{ g_new_version }}" -# The cli image is used by openshift_facts to determine the currently installed +# The cli image is used by openshift_docker_facts to determine the currently installed # version. We need to explicitly pull the latest image to handle cases where # the locally cached 'latest' tag is older the g_new_version. - name: Download cli image hosts: oo_masters_to_config:oo_nodes_to_config roles: - - openshift_facts + - { role: openshift_docker_facts } tasks: - name: Pull Images command: > @@ -124,7 +133,7 @@ - name: Reconcile Cluster Roles and Cluster Role Bindings and Security Context Constraints hosts: oo_masters_to_config roles: - - { role: openshift_cli, openshift_image_tag: "v{{ g_new_version }}" } + - { role: openshift_cli, openshift_image_tag: "v{{ g_new_version }}" } vars: origin_reconcile_bindings: "{{ deployment_type == 'origin' and g_new_version | version_compare('1.0.6', '>') }}" ent_reconcile_bindings: true |