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

roles/openshift_storage_glusterfs/files/v3.6/deploy-heketi-template.yml

@@ -85,8 +85,6 @@ objects:
           volumeMounts:
           - name: db
             mountPath: /var/lib/heketi
-          - name: topology
-            mountPath: ${TOPOLOGY_PATH}
           - name: config
             mountPath: /etc/heketi
           readinessProbe:
@@ -103,9 +101,6 @@ objects:
               port: 8080
         volumes:
         - name: db
-        - name: topology
-          secret:
-            secretName: heketi-${CLUSTER_NAME}-topology-secret
         - name: config
           secret:
             secretName: heketi-${CLUSTER_NAME}-config-secret
@@ -138,6 +133,3 @@ parameters:
   displayName: GlusterFS cluster name
   description: A unique name to identify this heketi service, useful for running multiple heketi instances
   value: glusterfs
-- name: TOPOLOGY_PATH
-  displayName: heketi topology file location
-  required: True

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

roles/openshift_storage_glusterfs/tasks/heketi_deploy_part2.yml

@@ -4,7 +4,7 @@
   register: setup_storage
 
 - name: Copy heketi-storage list
-  shell: "{{ openshift.common.client_binary }} rsh --namespace={{ glusterfs_namespace }} {{ heketi_pod.results.results[0]['items'][0]['metadata']['name'] }} cat /tmp/heketi-storage.json > {{ mktemp.stdout }}/heketi-storage.json"
+  shell: "{{ openshift.common.client_binary }} rsh --namespace={{ glusterfs_namespace }} {{ deploy_heketi_pod.results.results[0]['items'][0]['metadata']['name'] }} cat /tmp/heketi-storage.json > {{ mktemp.stdout }}/heketi-storage.json"
 
 # This is used in the subsequent task
 - name: Copy the admin client config