summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose A. Rivera <jarrpa@redhat.com>2017-07-13 11:21:11 -0500
committerJose A. Rivera <jarrpa@redhat.com>2017-07-14 10:37:29 -0500
commit11d153a8a573af95d1f7f30df936e72e466c595e (patch)
treea8ad4d24fabc1b2ec110cbb696f3d382ef2fd1f4
parent0624a1f36583c832b5b2e0c791a6926e56053e3e (diff)
downloadopenshift-11d153a8a573af95d1f7f30df936e72e466c595e.tar.gz
openshift-11d153a8a573af95d1f7f30df936e72e466c595e.tar.bz2
openshift-11d153a8a573af95d1f7f30df936e72e466c595e.tar.xz
openshift-11d153a8a573af95d1f7f30df936e72e466c595e.zip
GlusterFS: Reintroduce heketi-cli check for non-native heketi
Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
-rw-r--r--roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml12
1 files changed, 12 insertions, 0 deletions
diff --git a/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml b/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml
index 6fc7a256e..81ca85b04 100644
--- a/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml
+++ b/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml
@@ -1,4 +1,16 @@
---
+- name: Make sure heketi-client is installed
+ package: name=heketi-client state=present
+ when:
+ - not openshift.common.is_atomic | bool
+ - not glusterfs_heketi_is_native | bool
+
+- name: Verify heketi-cli is installed
+ shell: "command -v heketi-cli >/dev/null 2>&1 || { echo >&2 'ERROR: Make sure heketi-cli is available, then re-run the installer'; exit 1; }"
+ changed_when: False
+ when:
+ - not glusterfs_heketi_is_native | bool
+
- name: Verify target namespace exists
oc_project:
state: present