From 73820278c8c1ca1bc83e1c69f4939c0a48d88e46 Mon Sep 17 00:00:00 2001
From: "Jose A. Rivera" <jarrpa@redhat.com>
Date: Wed, 31 May 2017 15:01:05 -0500
Subject: GlusterFS: Skip heketi-cli install on Atomic
Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
---
roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml | 5 +++++
1 file changed, 5 insertions(+)
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:
--
cgit v1.2.3