diff options
author | Jason DeTiberus <jdetiber@redhat.com> | 2016-02-09 23:10:22 -0500 |
---|---|---|
committer | Jason DeTiberus <jdetiber@redhat.com> | 2016-02-09 23:15:55 -0500 |
commit | 3e80073b3b9052bedda3850c7844bef50f489ef0 (patch) | |
tree | 1e516b4a0dc777bc15606e50505fd60f3b7e5cc1 /roles/openshift_manageiq | |
parent | 39fc2154a5ba751b1a1550486fe33943019e8528 (diff) | |
download | openshift-3e80073b3b9052bedda3850c7844bef50f489ef0.tar.gz openshift-3e80073b3b9052bedda3850c7844bef50f489ef0.tar.bz2 openshift-3e80073b3b9052bedda3850c7844bef50f489ef0.tar.xz openshift-3e80073b3b9052bedda3850c7844bef50f489ef0.zip |
Add gte check for 3.2, update version checks to gte
Diffstat (limited to 'roles/openshift_manageiq')
-rw-r--r-- | roles/openshift_manageiq/tasks/main.yaml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/roles/openshift_manageiq/tasks/main.yaml b/roles/openshift_manageiq/tasks/main.yaml index 0357fc85a..d2ff1b4b7 100644 --- a/roles/openshift_manageiq/tasks/main.yaml +++ b/roles/openshift_manageiq/tasks/main.yaml @@ -1,7 +1,7 @@ --- - fail: msg: "The openshift_manageiq role requires OpenShift Enterprise 3.1 or Origin 1.1." - when: not openshift.common.version_greater_than_3_1_or_1_1 | bool + when: not openshift.common.version_gte_3_1_or_1_1 | bool - name: Copy Configuration to temporary conf command: > @@ -9,7 +9,7 @@ changed_when: false - name: Add Managment Infrastructure project - command: > + command: > {{ openshift.common.admin_binary }} new-project management-infra --description="Management Infrastructure" @@ -20,9 +20,9 @@ - name: Create Service Account shell: > - echo {{ manageiq_service_account | to_json | quote }} | - {{ openshift.common.client_binary }} create - -n management-infra + echo {{ manageiq_service_account | to_json | quote }} | + {{ openshift.common.client_binary }} create + -n management-infra --config={{manage_iq_tmp_conf}} -f - register: osmiq_create_service_account @@ -32,7 +32,7 @@ - name: Create Cluster Role shell: > echo {{ manageiq_cluster_role | to_json | quote }} | - {{ openshift.common.client_binary }} create + {{ openshift.common.client_binary }} create --config={{manage_iq_tmp_conf}} -f - register: osmiq_create_cluster_role |