diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-25 09:42:49 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-25 09:42:49 -0700 |
commit | 33ac861412ab745b0cd36cc42735b92953737661 (patch) | |
tree | 17c49e2824cd39061161ba27df04fa999971360e /roles/openshift_storage_glusterfs/tasks/heketi_deploy_part1.yml | |
parent | 67ff061a940a4b9dce6686b8a00a3eb52aeeb698 (diff) | |
parent | 62977f65b6aefb17a9a0ffd7e468cbe806251e71 (diff) | |
download | openshift-33ac861412ab745b0cd36cc42735b92953737661.tar.gz openshift-33ac861412ab745b0cd36cc42735b92953737661.tar.bz2 openshift-33ac861412ab745b0cd36cc42735b92953737661.tar.xz openshift-33ac861412ab745b0cd36cc42735b92953737661.zip |
Merge pull request #5415 from ttindell2/master
Automatic merge from submit-queue
#5362 GlusterFS fails to run more than once
#5362 Added the ability to have the GlusterFS ansible script run more than once. It also allows to update the topology of the Gluster cluster even if the Gluster cluster has already been deployed.
@dustymabe
Diffstat (limited to 'roles/openshift_storage_glusterfs/tasks/heketi_deploy_part1.yml')
-rw-r--r-- | roles/openshift_storage_glusterfs/tasks/heketi_deploy_part1.yml | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/roles/openshift_storage_glusterfs/tasks/heketi_deploy_part1.yml b/roles/openshift_storage_glusterfs/tasks/heketi_deploy_part1.yml index 3ba1eb2d2..73396c9af 100644 --- a/roles/openshift_storage_glusterfs/tasks/heketi_deploy_part1.yml +++ b/roles/openshift_storage_glusterfs/tasks/heketi_deploy_part1.yml @@ -6,16 +6,6 @@ with_items: - "deploy-heketi-template.yml" -- name: Create heketi topology secret - oc_secret: - namespace: "{{ glusterfs_namespace }}" - state: present - name: "heketi-{{ glusterfs_name }}-topology-secret" - force: True - files: - - name: topology.json - path: "{{ mktemp.stdout }}/topology.json" - - name: Create deploy-heketi template oc_obj: namespace: "{{ glusterfs_namespace }}" @@ -39,18 +29,7 @@ HEKETI_EXECUTOR: "{{ glusterfs_heketi_executor }}" HEKETI_KUBE_NAMESPACE: "{{ glusterfs_namespace }}" CLUSTER_NAME: "{{ glusterfs_name }}" - TOPOLOGY_PATH: "{{ mktemp.stdout }}" -- name: Wait for deploy-heketi pod - oc_obj: - namespace: "{{ glusterfs_namespace }}" - kind: pod - state: list - selector: "glusterfs=deploy-heketi-{{ glusterfs_name }}-pod" - register: heketi_pod - until: - - "heketi_pod.results.results[0]['items'] | count > 0" - # Pod's 'Ready' status must be True - - "heketi_pod.results.results[0]['items'] | oo_collect(attribute='status.conditions') | oo_collect(attribute='status', filters={'type': 'Ready'}) | map('bool') | select | list | count == 1" - delay: 10 - retries: "{{ (glusterfs_timeout | int / 10) | int }}" +- name: Set heketi Deployed fact + set_fact: + glusterfs_heketi_deploy_is_missing: False |