From 253de34b813a432ddc982ca35f830c0327bb8347 Mon Sep 17 00:00:00 2001 From: Henry Geay de Montenon Date: Fri, 20 Jan 2023 18:57:40 +0100 Subject: [PATCH] small fixes --- files/ceph-imgreg-pvc.yaml | 2 +- files/storage-cluster-lite.yaml | 4 ++++ tasks/main.yml | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/files/ceph-imgreg-pvc.yaml b/files/ceph-imgreg-pvc.yaml index 5acf6b5..eb53f64 100644 --- a/files/ceph-imgreg-pvc.yaml +++ b/files/ceph-imgreg-pvc.yaml @@ -9,5 +9,5 @@ spec: - ReadWriteMany resources: requests: - storage: 200Gi + storage: 100Gi diff --git a/files/storage-cluster-lite.yaml b/files/storage-cluster-lite.yaml index 25227c4..780e2f2 100644 --- a/files/storage-cluster-lite.yaml +++ b/files/storage-cluster-lite.yaml @@ -3,6 +3,10 @@ kind: StorageCluster metadata: name: ocs-storagecluster namespace: openshift-storage + annotations: + cluster.ocs.openshift.io/local-devices: "true" + uninstall.ocs.openshift.io/cleanup-policy: delete + uninstall.ocs.openshift.io/mode: graceful spec: resources: mon: diff --git a/tasks/main.yml b/tasks/main.yml index d36572c..834482e 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -154,10 +154,12 @@ namespace: openshift-image-registry name: image-registry-storage state: absent + when: ocp4_aio_deploy_nfs - name: Wait for image registry to stabilise on OCS pause: minutes: 3 + when: ocp4_aio_deploy_nfs - name: Enable Ceph Tools pod for troubleshooting ansible.builtin.command: >