summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2015-10-07 10:52:15 -0400
committerAndrew Butcher <abutcher@redhat.com>2015-10-12 14:03:38 -0400
commitdc9e087205b7ce4b843a40f5d0046b5ad6634a70 (patch)
tree5fc3336f0f0c80bdfa730eb32d20946ef952fef6
parent071eee9acb80621919dda2a07f9fe9c56dcfda27 (diff)
downloadopenshift-dc9e087205b7ce4b843a40f5d0046b5ad6634a70.tar.gz
openshift-dc9e087205b7ce4b843a40f5d0046b5ad6634a70.tar.bz2
openshift-dc9e087205b7ce4b843a40f5d0046b5ad6634a70.tar.xz
openshift-dc9e087205b7ce4b843a40f5d0046b5ad6634a70.zip
Add `oadm reconcile-cluster-role-bindings` to upgrade playbook.
Switch to version_compare filter for conditionals.
-rw-r--r--playbooks/adhoc/upgrades/upgrade.yml15
1 files changed, 14 insertions, 1 deletions
diff --git a/playbooks/adhoc/upgrades/upgrade.yml b/playbooks/adhoc/upgrades/upgrade.yml
index e666f0472..b43ab7607 100644
--- a/playbooks/adhoc/upgrades/upgrade.yml
+++ b/playbooks/adhoc/upgrades/upgrade.yml
@@ -40,7 +40,7 @@
hosts: oo_first_master
tasks:
fail: This playbook requires Origin 1.0.6 or Atomic OpenShift 3.0.2 or later
- when: _new_version.stdout < 1.0.6 or (_new_version.stdout >= 3.0 and _new_version.stdout < 3.0.2)
+ 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: Update cluster policy
hosts: oo_first_master
@@ -50,6 +50,19 @@
{{ openshift.common.admin_binary}} --config={{ openshift.common.config_base }}/master/admin.kubeconfig
policy reconcile-cluster-roles --confirm
+- name: Update cluster policy bindings
+ hosts: oo_first_master
+ tasks:
+ - name: oadm policy reconcile-cluster-role-bindings --confirm
+ command: >
+ {{ openshift.common.admin_binary}} --config={{ openshift.common.config_base }}/master/admin.kubeconfig
+ policy reconcile-cluster-role-bindings
+ --exclude-groups=system:authenticated
+ --exclude-groups=system:unauthenticated
+ --exclude-users=system:anonymous
+ --additive-only=true --confirm
+ when: ( _new_version.stdout | version_compare('1.0.6', '>') and _new_version.stdout | version_compare('3.0','<') ) or _new_version.stdout | version_compare('3.0.2','>')
+
- name: Upgrade default router
hosts: oo_first_master
vars: