summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-10-20 14:29:26 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2015-10-20 14:29:26 -0400
commitabb8c470ce4452373c44e224add5eb4a5ec21578 (patch)
tree7f31926a7d2a806424fe824b5a577f5371b1fab4
parentef04e6ee30beef7e4e195b95374a65f4485c6ce6 (diff)
parentdc9e087205b7ce4b843a40f5d0046b5ad6634a70 (diff)
downloadopenshift-abb8c470ce4452373c44e224add5eb4a5ec21578.tar.gz
openshift-abb8c470ce4452373c44e224add5eb4a5ec21578.tar.bz2
openshift-abb8c470ce4452373c44e224add5eb4a5ec21578.tar.xz
openshift-abb8c470ce4452373c44e224add5eb4a5ec21578.zip
Merge pull request #671 from abutcher/role-bindings
Add `oadm reconcile-cluster-role-bindings` to upgrade playbook.
-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: