RedHatTraining/agnosticd.git

ocp4-workload-ceph: Fix rbd secret name for stable images (#1028)

* ocp4-ceph-workload: Fix rbd and cephfs sc secrets

- For non-canary images publish should be used for secret names of both
SCs

* Regress changes for cephfs, keep rbd changes

			@@ -54,4 +54,4 @@
			# mounter: kernel
			reclaimPolicy: Delete
			mountOptions:
			- noexec
			- noexec

			@@ -42,11 +42,11 @@
			# The secrets have to contain Ceph admin credentials.
			csi.storage.k8s.io/provisioner-secret-name: csi-rbd-secret
			csi.storage.k8s.io/provisioner-secret-namespace: default
			csi.storage.k8s.io/node-stage-secret-name: csi-rbd-secret
			csi.storage.k8s.io/node-stage-secret-namespace: default
			csi.storage.k8s.io/node-publish-secret-name: csi-rbd-secret
			csi.storage.k8s.io/node-publish-secret-namespace: default
			# Ceph users for operating RBD
			adminid: admin

			# uncomment the following to use rbd-nbd as mounter on supported nodes
			# mounter: rbd-nbd
			reclaimPolicy: Delete
			reclaimPolicy: Delete

	ansible/roles/ocp4-workload-ceph/templates/cephfs.yaml.j2	2 ●●●●● patch \| view \| raw \| blame \| history
	ansible/roles/ocp4-workload-ceph/templates/rbd.yaml.j2	6 ●●●●● patch \| view \| raw \| blame \| history