diff options
author | Devan Goodwin <dgoodwin@redhat.com> | 2015-11-04 08:14:46 -0400 |
---|---|---|
committer | Devan Goodwin <dgoodwin@redhat.com> | 2015-11-04 08:14:46 -0400 |
commit | 4a4ecb7e4517dddf989441f0e7d99617917f942d (patch) | |
tree | 53ba85ec501cfed1aa609d757782e330c452091c /playbooks/adhoc | |
parent | 867a372321270311946375d71f7d08aab2b56d67 (diff) | |
download | openshift-4a4ecb7e4517dddf989441f0e7d99617917f942d.tar.gz openshift-4a4ecb7e4517dddf989441f0e7d99617917f942d.tar.bz2 openshift-4a4ecb7e4517dddf989441f0e7d99617917f942d.tar.xz openshift-4a4ecb7e4517dddf989441f0e7d99617917f942d.zip |
Skip fail if enterprise deployment type depending on version.
Diffstat (limited to 'playbooks/adhoc')
-rw-r--r-- | playbooks/adhoc/upgrades/upgrade.yml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/playbooks/adhoc/upgrades/upgrade.yml b/playbooks/adhoc/upgrades/upgrade.yml index 539710469..ffcd2757b 100644 --- a/playbooks/adhoc/upgrades/upgrade.yml +++ b/playbooks/adhoc/upgrades/upgrade.yml @@ -98,6 +98,14 @@ fail: This playbook requires Origin 1.0.6 or Atomic OpenShift 3.0.2 or later when: _new_version.stdout | version_compare('1.0.6','<') or ( _new_version.stdout | version_compare('3.0','>=' and _new_version.stdout | version_compare('3.0.2','<') ) +- name: Verify upgrade can proceed + hosts: masters + tasks: + # Checking the global deployment type rather than host facts, this is about + # what the user is requesting. + - fail: msg="Deployment type 'enterprise' must be updated to 'openshift-enterprise' for upgrade to proceed" + when: deployment_type == "enterprise" and (_new_version.stdout | version_compare('1.0.7', '>=') or _new_version.stdout | version_compare('3.1', '>=')) + - name: Update cluster policy hosts: oo_first_master tasks: |