diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-03 08:17:27 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-03 08:17:27 -0800 |
| commit | 9e0e2a6c4fe14373ba51aa08b0e87f1492559394 (patch) | |
| tree | 0f36ad524177416b9898d475f259d8853eb07d88 /roles | |
| parent | 2a0eb131853c9dbbe5b2e4f4b5a61da08bf2421f (diff) | |
| parent | da60c1b58b092a47ac706b74893a7ac93f078bc9 (diff) | |
| download | openshift-9e0e2a6c4fe14373ba51aa08b0e87f1492559394.tar.gz openshift-9e0e2a6c4fe14373ba51aa08b0e87f1492559394.tar.bz2 openshift-9e0e2a6c4fe14373ba51aa08b0e87f1492559394.tar.xz openshift-9e0e2a6c4fe14373ba51aa08b0e87f1492559394.zip | |
Merge pull request #6996 from mjudeikis/restart_fix_atomic
Automatic merge from submit-queue.
check for restart on atomic
fix atomic host storage
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_node/tasks/storage_plugins/iscsi.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml | 5 |
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 |