summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMangirdas <m.judeikis@gmail.com>2018-02-01 11:07:16 +0000
committerMangirdas <m.judeikis@gmail.com>2018-02-02 13:40:59 +0000
commitda60c1b58b092a47ac706b74893a7ac93f078bc9 (patch)
treeff1cdb44568d12dba82acc46df1ec5a3ea150d37
parent1a58f7fc7622e3e96dab0b45737203ae89af8e76 (diff)
downloadopenshift-da60c1b58b092a47ac706b74893a7ac93f078bc9.tar.gz
openshift-da60c1b58b092a47ac706b74893a7ac93f078bc9.tar.bz2
openshift-da60c1b58b092a47ac706b74893a7ac93f078bc9.tar.xz
openshift-da60c1b58b092a47ac706b74893a7ac93f078bc9.zip
dynamic inventory bug when group exists but its empty
-rw-r--r--roles/openshift_node/tasks/storage_plugins/iscsi.yml1
-rw-r--r--roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml5
2 files changed, 5 insertions, 1 deletions
diff --git a/roles/openshift_node/tasks/storage_plugins/iscsi.yml b/roles/openshift_node/tasks/storage_plugins/iscsi.yml
index 72415f9a6..e31433dbc 100644
--- a/roles/openshift_node/tasks/storage_plugins/iscsi.yml
+++ b/roles/openshift_node/tasks/storage_plugins/iscsi.yml
@@ -15,6 +15,7 @@
name: "{{ item }}"
state: started
enabled: True
+ when: not openshift_is_atomic | bool
with_items:
- multipathd
- rpcbind
diff --git a/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml b/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml
index a5fdae803..e6e261b52 100644
--- a/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml
+++ b/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml
@@ -313,7 +313,10 @@
- glusterfs_storageclass or glusterfs_s3_deploy
- include_tasks: glusterblock_deploy.yml
- when: glusterfs_block_deploy
+ when:
+ - glusterfs_block_deploy
+ #TODO: Remove this when multipathd will be available on atomic
+ - not openshift_is_atomic | bool
- block:
- name: Create heketi block secret