From e8b886d56926bb0c47700944bad47cdedf56ad5d Mon Sep 17 00:00:00 2001
From: Steven Smith <stevsmit@stevsmit.remote.csb>
Date: Thu, 31 Aug 2023 15:59:01 -0400
Subject: [PATCH] Updates Ceph IR docs due to change in ODF

---
 ...guring-registry-storage-rhodf-cephrgw.adoc | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/modules/registry-configuring-registry-storage-rhodf-cephrgw.adoc b/modules/registry-configuring-registry-storage-rhodf-cephrgw.adoc
index fcb23a279a..dca872af12 100644
--- a/modules/registry-configuring-registry-storage-rhodf-cephrgw.adoc
+++ b/modules/registry-configuring-registry-storage-rhodf-cephrgw.adoc
@@ -35,11 +35,11 @@ cat <<EOF | oc apply -f -
 apiVersion: objectbucket.io/v1alpha1
 kind: ObjectBucketClaim
 metadata:
-  name: rgwtest
+  name: rgwbucket
   namespace: openshift-storage <1>
 spec:
   storageClassName: ocs-storagecluster-ceph-rgw
-  generateBucketName: rgwtest
+  generateBucketName: rgwbucket
 EOF
 ----
 <1> Alternatively, you can use the `openshift-image-registry` namespace.
@@ -48,19 +48,19 @@ EOF
 +
 [source,terminal]
 ----
-$ bucket_name=$(oc get obc -n openshift-storage rgwtest -o jsonpath='{.spec.bucketName}')
+$ bucket_name=$(oc get obc -n openshift-storage rgwbucket -o jsonpath='{.spec.bucketName}')
 ----
 
 . Get the AWS credentials by entering the following commands:
 +
 [source,terminal]
 ----
-$ AWS_ACCESS_KEY_ID=$(oc get secret -n openshift-storage rgwtest -o yaml | grep -w "AWS_ACCESS_KEY_ID:" | head -n1 | awk '{print $2}' | base64 --decode)
+$ AWS_ACCESS_KEY_ID=$(oc get secret -n openshift-storage rgwbucket -o jsonpath='{.data.AWS_ACCESS_KEY_ID}' | base64 --decode)
 ----
 +
 [source,terminal]
 ----
-$ AWS_SECRET_ACCESS_KEY=$(oc get secret -n openshift-storage rgwtest -o yaml | grep -w "AWS_SECRET_ACCESS_KEY:" | head -n1 | awk '{print $2}' | base64 --decode)
+$ AWS_SECRET_ACCESS_KEY=$(oc get secret -n openshift-storage rgwbucket -o jsonpath='{.data.AWS_SECRET_ACCESS_KEY}' | base64 --decode)
 ----
 
 . Create the secret `image-registry-private-configuration-user` with the AWS credentials for the new bucket under `openshift-image-registry project` by entering the following command:
@@ -70,19 +70,14 @@ $ AWS_SECRET_ACCESS_KEY=$(oc get secret -n openshift-storage rgwtest -o yaml | g
 $ oc create secret generic image-registry-private-configuration-user --from-literal=REGISTRY_STORAGE_S3_ACCESSKEY=${AWS_ACCESS_KEY_ID} --from-literal=REGISTRY_STORAGE_S3_SECRETKEY=${AWS_SECRET_ACCESS_KEY} --namespace openshift-image-registry
 ----
 
-. Create a encryption route for Ceph RGW by entering the following command:
+. Get the `buckethost` value by entering the following command:
 +
 [source,terminal]
 ----
-$ oc create route reencrypt <route_name> --service=rook-ceph-rgw-ocs-storagecluster-cephobjectstore --port=https -n openshift-storage
+$ route_host=$(oc get objectbucket $bucket_name -n openshift-storage -o=jsonpath='{.spec.endpoint.bucketHost}')
 ----
 +
-.. Get the route host by entering the following command:
-+
-[source,terminal]
-----
-$ route_host=$(oc get route <route_name> -n openshift-storage -o=jsonpath='{.spec.host}')
-----
+
 . Create a config map that uses an ingress certificate by entering the following commands:
 +
 [source,terminal]