migtools · weshayutin · May 30, 2023 · May 25, 2023
diff --git a/oadp/bookbag/workshop/content/Conclusion.adoc b/oadp/bookbag/workshop/content/Conclusion.adoc
@@ -16,6 +16,6 @@
 |===
 |Type |Link
 |Source Code |https://github.com/openshift/oadp-operator
-|Velero Documentation |https://velero.io/docs/v1.7
+|Velero Documentation |https://velero.io/docs/v1.9/
 |YouTube Channel |https://www.youtube.com/channel/UCBDU5UK5Okg3mlIMygpkbNA?view_as=subscriber
 |===
diff --git a/oadp/bookbag/workshop/content/Environment.adoc b/oadp/bookbag/workshop/content/Environment.adoc
@@ -2,6 +2,7 @@
 :markup-in-source: verbatim,attributes,quotes
 :OCP4_PASSWORD: %ocp4_password%
 :CLUSTER_ADMIN_USER: %cluster_admin_user%
+:CLUSTER_ADMIN_PASSWORD: %cluster_admin_password%
 :APPS_URL: %apps_url%
 :API_URL: %api_url%
 == Overview
@@ -18,7 +19,7 @@ The following lab environment has been provisioned for you to use with this Lab.
 |OCP Console |http://console-openshift-console.{APPS_URL}
 |API |{API_URL}
 |OCP admin username| {CLUSTER_ADMIN_USER}
-|OCP admin password| {OCP4_PASSWORD}
+|OCP admin password| {CLUSTER_ADMIN_PASSWORD}
 |===
 
 On the right, you will see two split terminals. We will generally use the lower terminal for most executions while upper terminal will be reserved for reviewing yaml files and watching result of executions.
@@ -45,7 +46,7 @@ echo copy
 You copy `{CLUSTER_ADMIN_USER}` password here if you need it.
 [source,bash,role=copy]
 ----
-%ocp4_password%
+%cluster_admin_password%
 ----
 
 We have also setup credentials for aws cli to be used with openshift storage.

diff --git a/oadp/bookbag/workshop/content/Prereqs.adoc b/oadp/bookbag/workshop/content/Prereqs.adoc
@@ -2,14 +2,15 @@
 :markup-in-source: verbatim,attributes,quotes
 :OCP4_PASSWORD: %ocp4_password%
 :CLUSTER_ADMIN_USER: %cluster_admin_user%
+:CLUSTER_ADMIN_PASSWORD: %cluster_admin_password%
 :APPS_URL: %apps_url%
 :API_URL: %api_url%
 
 
 Login as {CLUSTER_ADMIN_USER}
 [source,bash,role=execute]
 ----
-oc login -u %cluster_admin_user% -p %ocp4_password%
+oc login -u %cluster_admin_user% -p %cluster_admin_password%
 ----
 
 Verify OpenShift version

diff --git a/oadp/bookbag/workshop/content/exercises/Ex1.adoc b/oadp/bookbag/workshop/content/exercises/Ex1.adoc
@@ -2,13 +2,13 @@
 :markup-in-source: verbatim,attributes,quotes
 :OCP4_PASSWORD: %ocp4_password%
 :CLUSTER_ADMIN_USER: %cluster_admin_user%
+:CLUSTER_ADMIN_PASSWORD: %cluster_admin_password%
 :APPS_URL: %apps_url%
 :API_URL: %api_url%
 
 == Backing up single namespace
 
-We are going to protecting a simple Product Inventory web-based application front-end, backed by Microsoft SQL Server. This application has been pre-deployed on your OCP 4 cluster in the `mssql-persistent` namespace, using a single PV backed by NFS for persistent storage.
-
+We are going to protecting a simple Product Inventory web-based application front-end, backed by Microsoft SQL Server. This application has been pre-deployed on your OCP 4 cluster in the `mssql-persistent` namespace.
 In our source OCP 4 cluster terminal, we can see the app running:
 
 [source,bash,role=execute]
@@ -62,6 +62,10 @@ You can check on the backup progress by running the following
 velero backup describe mssql-backup
 ----
 When the backup `Phase:` is `Completed`., proceed to next section.
+[source,bash,role=execute]
+----
+velero backup describe mssql-backup | grep Phase:
+----
 
 === Viewing backup content in S3 storage
 Backup content is stored in S3 storage in the specified content in the prefix location under folder backup inside the backup name's folder.

diff --git a/oadp/bookbag/workshop/content/exercises/Ex2.adoc b/oadp/bookbag/workshop/content/exercises/Ex2.adoc
@@ -2,15 +2,15 @@
 :markup-in-source: verbatim,attributes,quotes
 :OCP4_PASSWORD: %ocp4_password%
 :CLUSTER_ADMIN_USER: %cluster_admin_user%
+:CLUSTER_ADMIN_PASSWORD: %cluster_admin_password%
 :APPS_URL: %apps_url%
 :API_URL: %api_url%
 
 == Backing up multiple namespaces
 
 In previous exercise, we backed up a single namespace using `--include-namespaces` flag from Velero CLI. This flag actually accepts a `stringArray`. We can backup multiple namespaces using the flag separating them by `,`.
 
-In addition to the Microsoft SQL Server application, we have pre-deployed for you a second application called `parks-app`. This application has been pre-deployed on your OCP 4 cluster in the `parks-app` namespace, using a single PV backed by NFS for persistent storage.
-
+In addition to the Microsoft SQL Server application, we have pre-deployed for you a second application called `parks-app`. This application has been pre-deployed on your OCP 4 cluster in the `parks-app` namespace.
 In our source OCP 4 cluster terminal, we can see the app running:
 
 [source,bash,role=execute]

diff --git a/oadp/bookbag/workshop/content/exercises/Ex3.adoc b/oadp/bookbag/workshop/content/exercises/Ex3.adoc
@@ -2,6 +2,7 @@
 :markup-in-source: verbatim,attributes,quotes
 :OCP4_PASSWORD: %ocp4_password%
 :CLUSTER_ADMIN_USER: %cluster_admin_user%
+:CLUSTER_ADMIN_PASSWORD: %cluster_admin_password%
 :APPS_URL: %apps_url%
 :API_URL: %api_url%
 

diff --git a/oadp/bookbag/workshop/content/exercises/troubleshooting/velero-pod-errors.adoc b/oadp/bookbag/workshop/content/exercises/troubleshooting/velero-pod-errors.adoc
@@ -17,4 +17,4 @@ velero backup logs mssql-backup | grep -i error
 ----
 We don't expect any errors here so the result should be empty.
 
-https://github.com/openshift/oadp-operator/blob/master/TROUBLESHOOTING.md[Link to commonly encountered errors when using Velero to backup and restore Kubernetes clusters.]
+https://github.com/openshift/oadp-operator/blob/oadp-1.1/docs/TROUBLESHOOTING.md[Link to commonly encountered errors when using Velero to backup and restore Kubernetes clusters.]