summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-04-13 10:36:58 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-04-14 14:39:26 -0400
commitc298560ff539d23f60a83876feba83c970283ce7 (patch)
treed723e6ea32ad9410d50163049242b3dc5e183c05 /playbooks/common/openshift-cluster
parentee3f0205333840e18c4796e53b0f061fec666333 (diff)
downloadopenshift-c298560ff539d23f60a83876feba83c970283ce7.tar.gz
openshift-c298560ff539d23f60a83876feba83c970283ce7.tar.bz2
openshift-c298560ff539d23f60a83876feba83c970283ce7.tar.xz
openshift-c298560ff539d23f60a83876feba83c970283ce7.zip
The openshift_docker role must set the version facts for containerized installs
QE found that for fresh installs we were basing the docker version facts of the images that could be pulled prior to configuring /etc/sysconfig/docker. This is an edge case but something we need to fix.
Diffstat (limited to 'playbooks/common/openshift-cluster')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml15
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