diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-10 10:14:58 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-10 10:14:58 -0500 |
| commit | 6f4aeb1039df339e8a4e1500920e078f09c944a3 (patch) | |
| tree | f1783601e7d455254c9a12211f1d549eb208f1f0 /roles/openshift_manageiq/tasks | |
| parent | a0701fd2d6401acf7dc9eb8c1e711d66b83dc554 (diff) | |
| parent | 3e80073b3b9052bedda3850c7844bef50f489ef0 (diff) | |
| download | openshift-6f4aeb1039df339e8a4e1500920e078f09c944a3.tar.gz openshift-6f4aeb1039df339e8a4e1500920e078f09c944a3.tar.bz2 openshift-6f4aeb1039df339e8a4e1500920e078f09c944a3.tar.xz openshift-6f4aeb1039df339e8a4e1500920e078f09c944a3.zip | |
Merge pull request #1368 from detiber/gte3_2
Add gte check for 3.2, update version checks to gte
Diffstat (limited to 'roles/openshift_manageiq/tasks')
| -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 |