Pushing changes to ensure that NFS imgreg is disabled if OCS is configured

Author: rdoxenham

tasks/main.yml

@@ -71,6 +71,16 @@
   delay: 30
   until: storage_cluster_success is not failed
 
+- name: Unset default storage class for nfs
+  ansible.builtin.command: >
+    oc patch storageclass nfs
+    -p '{"metadata": {"annotations":{"storageclass.kubernetes.io/is-default-class":"false"}}}'
+  register: default_nfsclass_success
+  retries: 1
+  delay: 30
+  until: default_nfsclass_success is not failed
+  when: ocp4_aio_deploy_nfs
+
 - name: Set default storage class to be ocs-storagecluster-ceph-rbd
   ansible.builtin.command: >
     oc patch storageclass ocs-storagecluster-ceph-rbd 
@@ -80,6 +90,30 @@
   delay: 30
   until: default_class_success is not failed
 
+- name: Create PVC for the Image Registry on OCS
+  k8s:
+      state: present
+      definition: "{{ lookup('file', 'ceph-imgreg-pvc.yaml') }}"
+  register: imgreg_volume_success
+  retries: 5
+  delay: 30
+  until: imgreg_volume_success is not failed
+
+- name: Enable OCS based PVC based storage for Image Registry
+  ansible.builtin.shell: >
+    oc patch configs.imageregistry.operator.openshift.io cluster --type merge --patch '{"spec":{"storage":{"pvc": {"claim": "ocs-imgreg"}}}}'
+
+- name: Delete the old PVC that may have been created for NFS
+  k8s:
+    kind: pvc
+    namespace: openshift-image-registry
+    name: image-registry-storage
+    state: absent
+
+- name: Wait for image registry to stabilise on OCS
+  pause:
+    minutes: 2
+
 - name: Enable Ceph Tools pod for troubleshooting
   ansible.builtin.command: >
     oc patch OCSInitialization ocsinit -n openshift-storage