Skip to content

Commit d6100a4

Browse files
authored
Merge pull request #74243 from anarnold97/fixing-broken-ifdef-statement
OADP-3847 - Fixing broken ifdef statement
2 parents 77ecdf0 + fada04b commit d6100a4

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

backup_and_restore/application_backup_and_restore/installing/installing-oadp-ocs.adoc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
= Configuring the OpenShift API for Data Protection with OpenShift Data Foundation
44
include::_attributes/common-attributes.adoc[]
55
:context: installing-oadp-ocs
6+
:installing-oadp-ocs:
67
:credentials: cloud-credentials
7-
:provider: gcp
8+
:provider: oadp-ocs
89

910
toc::[]
1011

@@ -45,3 +46,5 @@ include::modules/oadp-installing-dpa-1-3.adoc[leveloffset=+1]
4546
include::modules/oadp-creating-object-bucket-claim.adoc[leveloffset=+2]
4647
include::modules/oadp-enabling-csi-dpa.adoc[leveloffset=+2]
4748

49+
50+
:installing-oadp-ocs!:

modules/oadp-installing-dpa-1-3.adoc

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
// * backup_and_restore/application_backup_and_restore/installing/installing-oadp-mcg.adoc
77
// * backup_and_restore/application_backup_and_restore/installing/installing-oadp-ocs.adoc
88

9+
910
:_mod-docs-content-type: PROCEDURE
1011
[id="oadp-installing-dpa-1-3_{context}"]
1112
= Installing the Data Protection Application 1.3
@@ -24,6 +25,7 @@ ifdef::installing-oadp-azure,installing-oadp-gcp,installing-oadp-mcg,installing-
2425
** `Secret` with a custom name for the backup location. You add this `Secret` to the `DataProtectionApplication` CR.
2526
** `Secret` with another custom name for the snapshot location. You add this `Secret` to the `DataProtectionApplication` CR.
2627
endif::[]
28+
2729
ifdef::installing-oadp-aws[]
2830
* If the backup and snapshot locations use different credentials, you must create a `Secret` with the default name, `{credentials}`, which contains separate profiles for the backup and snapshot location credentials.
2931
endif::[]
@@ -39,6 +41,7 @@ If you do not want to specify backup or snapshot locations during the installati
3941
. Under *Provided APIs*, click *Create instance* in the *DataProtectionApplication* box.
4042

4143
. Click *YAML View* and update the parameters of the `DataProtectionApplication` manifest:
44+
4245
ifdef::installing-oadp-aws[]
4346
+
4447
[source,yaml,subs="attributes+"]
@@ -95,6 +98,7 @@ spec:
9598
<11> Specify a snapshot location, unless you use CSI snapshots or a File System Backup (FSB) to back up PVs.
9699
<12> The snapshot location must be in the same region as the PVs.
97100
endif::[]
101+
98102
ifdef::installing-oadp-azure[]
99103
+
100104
[source,yaml,subs="attributes+"]
@@ -155,6 +159,7 @@ spec:
155159
<13> Specify a prefix for Velero backups, for example, `velero`, if the bucket is used for multiple purposes.
156160
<14> You do not need to specify a snapshot location if you use CSI snapshots or Restic to back up PVs.
157161
endif::[]
162+
158163
ifdef::installing-oadp-gcp[]
159164
+
160165
[source,yaml,subs="attributes+"]
@@ -210,6 +215,7 @@ spec:
210215
<13> The snapshot location must be in the same region as the PVs.
211216
<14> Google workload identity federation supports internal image backup. Set this field to `false` if you do not want to use image backup.
212217
endif::[]
218+
213219
ifdef::installing-oadp-mcg[]
214220
+
215221
[source,yaml,subs="attributes+"]
@@ -260,6 +266,7 @@ spec:
260266
<10> Specify a bucket as the backup storage location. If the bucket is not a dedicated bucket for Velero backups, you must specify a prefix.
261267
<11> Specify a prefix for Velero backups, for example, `velero`, if the bucket is used for multiple purposes.
262268
endif::[]
269+
263270
ifdef::installing-oadp-ocs[]
264271
+
265272
[source,yaml,subs="attributes+"]
@@ -296,7 +303,7 @@ spec:
296303
----
297304
<1> The default namespace for OADP is `openshift-adp`. The namespace is a variable and is configurable.
298305
<2> Optional: The `kubevirt` plugin is used with {VirtProductName}.
299-
<32> Specify the default plugin for the backup provider, for example, `gcp`, if appropriate.
306+
<3> Specify the default plugin for the backup provider, for example, `gcp`, if appropriate.
300307
<4> Specify the `csi` default plugin if you use CSI snapshots to back up PVs. The `csi` plugin uses the link:https://{velero-domain}/docs/main/csi/[Velero CSI beta snapshot APIs]. You do not need to configure a snapshot location.
301308
<5> The `openshift` plugin is mandatory.
302309
<6> Specify how many minutes to wait for several Velero resources before timeout occurs, such as Velero CRD availability, volumeSnapshot deletion, and backup repository availability. The default is 10m.
@@ -309,6 +316,7 @@ spec:
309316
<13> Specify a bucket as the backup storage location. If the bucket is not a dedicated bucket for Velero backups, you must specify a prefix.
310317
<14> Specify a prefix for Velero backups, for example, `velero`, if the bucket is used for multiple purposes.
311318
endif::[]
319+
312320
ifdef::virt-installing-configuring-oadp[]
313321
+
314322
[source,yaml,subs="attributes+"]
@@ -404,8 +412,8 @@ replicaset.apps/velero-588db7f655 1 1
404412
$ oc get dpa dpa-sample -n openshift-adp -o jsonpath='{.status}'
405413
----
406414
.Example output
407-
[source,yaml]
408415
+
416+
[source,yaml]
409417
----
410418
{"conditions":[{"lastTransitionTime":"2023-10-27T01:23:57Z","message":"Reconcile complete","reason":"Complete","status":"True","type":"Reconciled"}]}
411419
----
@@ -419,8 +427,8 @@ $ oc get dpa dpa-sample -n openshift-adp -o jsonpath='{.status}'
419427
$ oc get backupStorageLocation -n openshift-adp
420428
----
421429
.Example output
422-
[source,yaml]
423430
+
431+
[source,yaml]
424432
----
425433
NAME PHASE LAST VALIDATED AGE DEFAULT
426434
dpa-sample-1 Available 1s 3d16h true

0 commit comments

Comments
 (0)