summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-03-07 16:36:42 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-03-07 16:36:42 -0500
commit44f443cd5afcad79c9afa49ff4f60c0448512f4f (patch)
tree65aa2b1dfb02388d9a6b2d208ad10bc80193a85b /playbooks/common/openshift-cluster
parent484547222a9f4dfef8b97c965ce637c56a9fc2e6 (diff)
parent64fa37b2b82b5f27fdbdca5a943e5c8158408e3d (diff)
downloadopenshift-44f443cd5afcad79c9afa49ff4f60c0448512f4f.tar.gz
openshift-44f443cd5afcad79c9afa49ff4f60c0448512f4f.tar.bz2
openshift-44f443cd5afcad79c9afa49ff4f60c0448512f4f.tar.xz
openshift-44f443cd5afcad79c9afa49ff4f60c0448512f4f.zip
Merge pull request #1559 from brenton/bz1315151
BZ1315151: Support openshift_image_tag
Diffstat (limited to 'playbooks/common/openshift-cluster')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml18
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml2
2 files changed, 15 insertions, 5 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml
index d423238ec..d2af4adbb 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml
@@ -40,6 +40,12 @@
valid version for a {{ target_version }} upgrade
when: openshift_pkg_version is defined and openshift_pkg_version.split('-',1).1 | version_compare(target_version ,'<')
+ - fail:
+ msg: >
+ openshift_image_tag is {{ openshift_image_tag }} which is not a
+ valid version for a {{ target_version }} upgrade
+ when: openshift_image_tag is defined and openshift_image_tag.split('v',1).1 | version_compare(target_version ,'<')
+
- name: Verify upgrade can proceed
hosts: oo_masters_to_config:oo_nodes_to_config
vars:
@@ -76,14 +82,18 @@
g_new_version: "{{ g_aos_versions.curr_version.split('-', 1).0 if g_aos_versions.avail_version is none else g_aos_versions.avail_version.split('-', 1).0 }}"
when: openshift_pkg_version is not defined
- - fail:
- msg: Verifying the correct version was found
- when: verify_upgrade_version is defined and g_new_version != verify_upgrade_version
-
- set_fact:
g_new_version: "{{ openshift_pkg_version | replace('-','') }}"
when: openshift_pkg_version is defined
+ - set_fact:
+ g_new_version: "{{ openshift_image_tag | replace('v','') }}"
+ when: openshift_image_tag is defined
+
+ - fail:
+ msg: Verifying the correct version was found
+ when: verify_upgrade_version is defined and g_new_version != verify_upgrade_version
+
- name: Update systemd units
script: ../files/ensure_system_units_have_version.sh {{ openshift.common.service_type }} {{ openshift.common.deployment_type }} {{ g_aos_versions.curr_version }}
when: openshift.common.is_containerized | bool
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 1f58a1e3f..3552b8734 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
@@ -95,7 +95,7 @@
- name: Reconcile Cluster Roles and Cluster Role Bindings and Security Context Constraints
hosts: oo_masters_to_config
roles:
- - { role: openshift_cli, 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