summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose A. Rivera <jarrpa@redhat.com>2017-05-31 15:01:05 -0500
committerJose A. Rivera <jarrpa@redhat.com>2017-06-13 13:10:23 -0500
commit73820278c8c1ca1bc83e1c69f4939c0a48d88e46 (patch)
treeb2a612ae57b218dc93d53597a01ddd48304aca93
parent46a75e7fac87d8017ecfc84896aa2df4d99d207a (diff)
downloadopenshift-73820278c8c1ca1bc83e1c69f4939c0a48d88e46.tar.gz
openshift-73820278c8c1ca1bc83e1c69f4939c0a48d88e46.tar.bz2
openshift-73820278c8c1ca1bc83e1c69f4939c0a48d88e46.tar.xz
openshift-73820278c8c1ca1bc83e1c69f4939c0a48d88e46.zip
GlusterFS: Skip heketi-cli install on Atomic
Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
-rw-r--r--roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml b/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml
index 72d5629ec..17b1eeb89 100644
--- a/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml
+++ b/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml
@@ -10,6 +10,11 @@
- name: Make sure heketi-client is installed
package: name=heketi-client state=present
+ when: not openshift.common.is_atomic | bool
+
+- name: Verify heketi-cli is installed
+ shell: "command -v heketi-cli >/dev/null 2>&1 || { echo >&2 'ERROR: heketi-cli must be installed.'; exit 1; }"
+ changed_when: False
- name: Delete pre-existing heketi resources
oc_obj: