Merge pull request #7405 from jarrpa/gluster-s3-sc-fix

GlusterFS: Use custom StorageClass for S3

roles/openshift_storage_glusterfs/files/gluster-s3-pvcs-template.yml

@@ -18,7 +18,7 @@ objects:
       glusterfs: s3-${CLUSTER_NAME}-${S3_ACCOUNT}-storage
       gluster-s3: ${CLUSTER_NAME}-${S3_ACCOUNT}-pvc
     annotations:
-      volume.beta.kubernetes.io/storage-class: "glusterfs-${CLUSTER_NAME}"
+      volume.beta.kubernetes.io/storage-class: "glusterfs-${CLUSTER_NAME}-s3"
   spec:
     accessModes:
     - ReadWriteMany
@@ -33,7 +33,7 @@ objects:
       glusterfs: s3-${CLUSTER_NAME}-${S3_ACCOUNT}-storage
       gluster-s3: ${CLUSTER_NAME}-${S3_ACCOUNT}-meta-pvc
     annotations:
-      volume.beta.kubernetes.io/storage-class: "glusterfs-${CLUSTER_NAME}"
+      volume.beta.kubernetes.io/storage-class: "glusterfs-${CLUSTER_NAME}-s3"
   spec:
     accessModes:
     - ReadWriteMany

roles/openshift_storage_glusterfs/tasks/gluster_s3_deploy.yml

@@ -24,12 +24,55 @@
   retries: "{{ (glusterfs_timeout | int / 10) | int }}"
   when: glusterfs_wipe
 
+- name: Create heketi secret
+  oc_secret:
+    namespace: "{{ glusterfs_namespace }}"
+    state: present
+    name: "heketi-{{ glusterfs_name }}-admin-secret"
+    type: "kubernetes.io/glusterfs"
+    force: True
+    contents:
+    - path: key
+      data: "{{ glusterfs_heketi_admin_key }}"
+  when:
+  - glusterfs_heketi_admin_key is defined
+
+- name: Get heketi Endpoints
+  oc_obj:
+    namespace: "{{ glusterfs_namespace }}"
+    kind: ep
+    state: list
+    name: "heketi-{{ glusterfs_name }}"
+  register: heketi_endpoints
+  when:
+  - glusterfs_heketi_is_native
+  - glusterfs_heketi_url is not defined
+
+- name: Determine StorageClass heketi URL
+  set_fact:
+    glusterfs_heketi_url: "{{ heketi_endpoints.results.results[0]['subsets'][0]['addresses'][0]['ip'] }}"
+    glusterfs_heketi_port: "{{ heketi_endpoints.results.results[0]['subsets'][0]['ports'][0]['port'] }}"
+  when:
+  - glusterfs_heketi_is_native
+  - glusterfs_heketi_url is not defined
+
+- name: Generate GlusterFS StorageClass for S3 file
+  template:
+    src: "{{ openshift_examples_content_version }}/gluster-s3-storageclass.yml.j2"
+    dest: "{{ mktemp.stdout }}/gluster-s3-storageclass.yml"
+
+- name: Create GlusterFS StorageClass for S3
+  oc_obj:
+    state: present
+    kind: storageclass
+    name: "glusterfs-{{ glusterfs_name }}-s3"
+    files:
+    - "{{ mktemp.stdout }}/gluster-s3-storageclass.yml"
+
 - name: Copy gluster-s3 PVCs template file
   copy:
-    src: "{{ item }}"
+    src: "gluster-s3-pvcs-template.yml"
     dest: "{{ mktemp.stdout }}/{{ item }}"
-  with_items:
-  - "gluster-s3-pvcs-template.yml"
 
 - name: Create gluster-s3 PVCs template
   oc_obj:
@@ -69,10 +112,8 @@
 
 - name: Copy gluster-s3 template file
   copy:
-    src: "{{ item }}"
+    src: "gluster-s3-template.yml"
     dest: "{{ mktemp.stdout }}/{{ item }}"
-  with_items:
-  - "gluster-s3-template.yml"
 
 - name: Create gluster-s3 template
   oc_obj:
@@ -111,3 +152,11 @@
   - "gluster_s3_pod.results.results[0]['items'] | lib_utils_oo_collect(attribute='status.conditions') | lib_utils_oo_collect(attribute='status', filters={'type': 'Ready'}) | map('bool') | select | list | count == 1"
   delay: 10
   retries: "{{ (glusterfs_timeout | int / 10) | int }}"
+
+- name: Delete GlusterFS StorageClass for S3
+  oc_obj:
+    namespace: "{{ glusterfs_namespace }}"
+    kind: "sc"
+    name: "glusterfs-{{ glusterfs_name }}-s3"
+    state: absent
+  failed_when: False

roles/openshift_storage_glusterfs/templates/gluster-s3-storageclass.yml.j2

@@ -0,0 +1,13 @@
+---
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: glusterfs-{{ glusterfs_name }}-s3
+provisioner: kubernetes.io/glusterfs
+parameters:
+  resturl: "http://{{ glusterfs_heketi_url }}:{{ glusterfs_heketi_port }}"
+  restuser: "admin"
+{% if glusterfs_heketi_admin_key is defined %}
+  secretNamespace: "{{ glusterfs_namespace }}"
+  secretName: "heketi-{{ glusterfs_name }}-admin-secret"
+{%- endif -%}