Merge pull request #9324 from vrutkovs/logging-pvc-claimRef

Set claimRef for logging PVC when NFS volume is created

roles/openshift_logging_elasticsearch/tasks/main.yaml

@@ -400,6 +400,16 @@
     when:
     - openshift_logging_elasticsearch_pvc_dynamic | bool
 
+  - name: Set claimRef for NFS PV
+    oc_edit:
+      kind: PersistentVolume
+      name: "logging-volume"
+      separator: '#'
+      content:
+        spec#claimRef#name: "{{ openshift_logging_elasticsearch_pvc_name }}"
+        spec#claimRef#namespace: "{{ openshift_logging_elasticsearch_namespace }}"
+    when: openshift_logging_storage_kind == "nfs"
+
   - name: Set ES storage
     oc_obj:
       state: present

roles/openshift_sanitize_inventory/tasks/__deprecations_logging.yml

@@ -40,7 +40,7 @@
 
 
 - set_fact:
-    openshift_logging_elasticsearch_pvc_dynamic: "{{ 'true' if openshift_logging_storage_kind | default(none) == 'dynamic' else '' }}"
+    openshift_logging_elasticsearch_pvc_dynamic: "{{ 'true' if openshift_logging_storage_kind | default(none) == 'dynamic' else omit if openshift_logging_storage_kind | default(none) == 'nfs' else '' }}"
     openshift_logging_elasticsearch_pvc_size: "{{ openshift_logging_storage_volume_size | default('10Gi') if openshift_logging_storage_kind | default(none) in ['dynamic','nfs'] else ''  }}"
     openshift_logging_elasticsearch_pvc_prefix: "{{ 'logging-es' if openshift_logging_storage_kind | default(none) == 'dynamic' else '' }}"
     openshift_logging_elasticsearch_ops_pvc_dynamic: "{{ 'true' if openshift_loggingops_storage_kind | default(none) == 'dynamic' else '' }}"