From d18045dea796d986907dbf4cc354d6544bf887b1 Mon Sep 17 00:00:00 2001 From: Avital Pinnick Date: Wed, 13 May 2020 10:06:53 +0300 Subject: [PATCH] update --- _topic_map.yml | 12 +++++------ .../configuring-replication-repository.adoc | 8 +++---- migration/migrating_3_4/deploying_cam.adoc | 2 ++ .../migrating-applications-with-cam.adoc | 6 +++++- .../configuring-replication-repository.adoc | 8 +++---- migration/migrating_4_1_4/deploying_cam.adoc | 2 ++ .../migrating-applications-with-cam.adoc | 6 +++++- .../configuring-replication-repository.adoc | 8 +++---- migration/migrating_4_2_4/deploying_cam.adoc | 2 ++ .../migrating-applications-with-cam.adoc | 6 +++++- modules/migration-adding-cluster-to-cam.adoc | 7 ++++--- ...-adding-replication-repository-to-cam.adoc | 1 + modules/migration-creating-ca-bundle.adoc | 21 +++++++++++++++++++ 13 files changed, 65 insertions(+), 24 deletions(-) create mode 100644 modules/migration-creating-ca-bundle.adoc diff --git a/_topic_map.yml b/_topic_map.yml index 3b3b3dfca0..dd9131ae02 100644 --- a/_topic_map.yml +++ b/_topic_map.yml @@ -1251,10 +1251,10 @@ Topics: File: planning-migration-3-to-4 - Name: Migrating application workloads from OpenShift Container Platform 3.7 to 4.3 File: migrating-application-workloads-3-to-4 - - Name: Configuring a replication repository - File: configuring-replication-repository - Name: Deploying the Cluster Application Migration tool File: deploying_cam + - Name: Configuring a replication repository + File: configuring-replication-repository - Name: Migrating applications with the CAM web console File: migrating-applications-with-cam - Name: Migrating control plane settings with the Control Plane Migration Assistant @@ -1266,10 +1266,10 @@ Topics: Topics: - Name: Migrating application workloads from OpenShift Container Platform 4.1 to 4.3 File: migrating-application-workloads-4_1-to-4 - - Name: Configuring a replication repository - File: configuring-replication-repository - Name: Deploying the Cluster Application Migration tool File: deploying_cam + - Name: Configuring a replication repository + File: configuring-replication-repository - Name: Migrating applications with the CAM web console File: migrating-applications-with-cam - Name: Troubleshooting @@ -1279,10 +1279,10 @@ Topics: Topics: - Name: Migrating application workloads from OpenShift Container Platform 4.2 to 4.3 File: migrating-application-workloads-4_2-to-4 - - Name: Configuring a replication repository - File: configuring-replication-repository - Name: Deploying the Cluster Application Migration tool File: deploying_cam + - Name: Configuring a replication repository + File: configuring-replication-repository - Name: Migrating applications with the CAM web console File: migrating-applications-with-cam - Name: Troubleshooting diff --git a/migration/migrating_3_4/configuring-replication-repository.adoc b/migration/migrating_3_4/configuring-replication-repository.adoc index c72725669b..31bcb13777 100644 --- a/migration/migrating_3_4/configuring-replication-repository.adoc +++ b/migration/migrating_3_4/configuring-replication-repository.adoc @@ -10,11 +10,11 @@ You must configure an object storage to use as a replication repository. The Clu The following storage providers are supported: +* xref:migration-configuring-mcg_{context}[Multi-Cloud Object Gateway (MCG)] +* xref:migration-configuring-aws-s3_{context}[Amazon Web Services (AWS) S3] +* xref:migration-configuring-gcp_{context}[Google Cloud Provider (GCP)] +* xref:migration-configuring-azure_{context}[Microsoft Azure] * Generic S3 object storage, for example, Minio or Ceph S3 -* Multi-Cloud Object Gateway (MCG) -* Amazon Web Services (AWS) S3 -* Google Cloud Provider (GCP) -* Microsoft Azure include::modules/migration-understanding-data-copy-methods.adoc[leveloffset=+1] diff --git a/migration/migrating_3_4/deploying_cam.adoc b/migration/migrating_3_4/deploying_cam.adoc index fb8ddf899b..56fc8a5ad9 100644 --- a/migration/migrating_3_4/deploying_cam.adoc +++ b/migration/migrating_3_4/deploying_cam.adoc @@ -18,4 +18,6 @@ include::modules/migration-installing-cam-operator-ocp-3.adoc[leveloffset=+1] include::modules/migration-installing-cam-operator-ocp-4.adoc[leveloffset=+1] :targetcluster-3-4!: +include::modules/migration-launching-cam.adoc[leveloffset=+1] + :!migrating-3-4: diff --git a/migration/migrating_3_4/migrating-applications-with-cam.adoc b/migration/migrating_3_4/migrating-applications-with-cam.adoc index 4d7ef121b7..29f8b2d149 100644 --- a/migration/migrating_3_4/migrating-applications-with-cam.adoc +++ b/migration/migrating_3_4/migrating-applications-with-cam.adoc @@ -6,7 +6,11 @@ include::modules/common-attributes.adoc[] toc::[] -include::modules/migration-launching-cam.adoc[leveloffset=+1] +You can migrate application workloads by adding your clusters and replication repository to the CAM web console. Then you can create and run a migration plan. + +If your cluster or replication repository are secured with self-signed certificates, you can create a CA certificate bundle file or disable SSL verification. + +include::modules/migration-creating-ca-bundle.adoc[leveloffset=+1] include::modules/migration-adding-cluster-to-cam.adoc[leveloffset=+1] include::modules/migration-adding-replication-repository-to-cam.adoc[leveloffset=+1] include::modules/migration-changing-migration-plan-limits.adoc[leveloffset=+1] diff --git a/migration/migrating_4_1_4/configuring-replication-repository.adoc b/migration/migrating_4_1_4/configuring-replication-repository.adoc index 8b49af4476..c587aa0e52 100644 --- a/migration/migrating_4_1_4/configuring-replication-repository.adoc +++ b/migration/migrating_4_1_4/configuring-replication-repository.adoc @@ -10,11 +10,11 @@ You must configure an object storage to use as a replication repository. The Clu The following storage providers are supported: +* xref:migration-configuring-mcg_{context}[Multi-Cloud Object Gateway (MCG)] +* xref:migration-configuring-aws-s3_{context}[Amazon Web Services (AWS) S3] +* xref:migration-configuring-gcp_{context}[Google Cloud Provider (GCP)] +* xref:migration-configuring-azure_{context}[Microsoft Azure] * Generic S3 object storage, for example, Minio or Ceph S3 -* Multi-Cloud Object Gateway (MCG) -* Amazon Web Services (AWS) S3 -* Google Cloud Provider (GCP) -* Microsoft Azure include::modules/migration-understanding-data-copy-methods.adoc[leveloffset=+1] diff --git a/migration/migrating_4_1_4/deploying_cam.adoc b/migration/migrating_4_1_4/deploying_cam.adoc index 3ac803fc36..fcf7e67227 100644 --- a/migration/migrating_4_1_4/deploying_cam.adoc +++ b/migration/migrating_4_1_4/deploying_cam.adoc @@ -18,4 +18,6 @@ include::modules/migration-installing-cam-operator-ocp-4.adoc[leveloffset=+1] include::modules/migration-installing-cam-operator-ocp-4.adoc[leveloffset=+1] :targetcluster-4_1-4_x!: +include::modules/migration-launching-cam.adoc[leveloffset=+1] + :!migrating-4_1-4_x: diff --git a/migration/migrating_4_1_4/migrating-applications-with-cam.adoc b/migration/migrating_4_1_4/migrating-applications-with-cam.adoc index 0f73a2c2f9..127a9e2295 100644 --- a/migration/migrating_4_1_4/migrating-applications-with-cam.adoc +++ b/migration/migrating_4_1_4/migrating-applications-with-cam.adoc @@ -6,7 +6,11 @@ include::modules/common-attributes.adoc[] toc::[] -include::modules/migration-launching-cam.adoc[leveloffset=+1] +You can migrate application workloads by adding your clusters and replication repository to the CAM web console. Then you can create and run a migration plan. + +If your cluster or replication repository are secured with self-signed certificates, you can create a CA certificate bundle file or disable SSL verification. + +include::modules/migration-creating-ca-bundle.adoc[leveloffset=+1] include::modules/migration-adding-cluster-to-cam.adoc[leveloffset=+1] include::modules/migration-adding-replication-repository-to-cam.adoc[leveloffset=+1] include::modules/migration-changing-migration-plan-limits.adoc[leveloffset=+1] diff --git a/migration/migrating_4_2_4/configuring-replication-repository.adoc b/migration/migrating_4_2_4/configuring-replication-repository.adoc index a249710c8c..44338c4c74 100644 --- a/migration/migrating_4_2_4/configuring-replication-repository.adoc +++ b/migration/migrating_4_2_4/configuring-replication-repository.adoc @@ -10,11 +10,11 @@ You must configure an object storage to use as a replication repository. The Clu The following storage providers are supported: +* xref:migration-configuring-mcg_{context}[Multi-Cloud Object Gateway (MCG)] +* xref:migration-configuring-aws-s3_{context}[Amazon Web Services (AWS) S3] +* xref:migration-configuring-gcp_{context}[Google Cloud Provider (GCP)] +* xref:migration-configuring-azure_{context}[Microsoft Azure] * Generic S3 object storage, for example, Minio or Ceph S3 -* Multi-Cloud Object Gateway (MCG) -* Amazon Web Services (AWS) S3 -* Google Cloud Provider (GCP) -* Microsoft Azure include::modules/migration-understanding-data-copy-methods.adoc[leveloffset=+1] diff --git a/migration/migrating_4_2_4/deploying_cam.adoc b/migration/migrating_4_2_4/deploying_cam.adoc index 18f54f159b..db04bac58e 100644 --- a/migration/migrating_4_2_4/deploying_cam.adoc +++ b/migration/migrating_4_2_4/deploying_cam.adoc @@ -18,4 +18,6 @@ include::modules/migration-installing-cam-operator-ocp-4.adoc[leveloffset=+1] include::modules/migration-installing-cam-operator-ocp-4.adoc[leveloffset=+1] :targetcluster-4_2-4_x!: +include::modules/migration-launching-cam.adoc[leveloffset=+1] + :!migrating-4_2-4_x: diff --git a/migration/migrating_4_2_4/migrating-applications-with-cam.adoc b/migration/migrating_4_2_4/migrating-applications-with-cam.adoc index 3bbbc28b3b..db56126ee2 100644 --- a/migration/migrating_4_2_4/migrating-applications-with-cam.adoc +++ b/migration/migrating_4_2_4/migrating-applications-with-cam.adoc @@ -6,7 +6,11 @@ include::modules/common-attributes.adoc[] toc::[] -include::modules/migration-launching-cam.adoc[leveloffset=+1] +You can migrate application workloads by adding your clusters and replication repository to the CAM web console. Then you can create and run a migration plan. + +If your cluster or replication repository are secured with self-signed certificates, you can create a CA certificate bundle file or disable SSL verification. + +include::modules/migration-creating-ca-bundle.adoc[leveloffset=+1] include::modules/migration-adding-cluster-to-cam.adoc[leveloffset=+1] include::modules/migration-adding-replication-repository-to-cam.adoc[leveloffset=+1] include::modules/migration-changing-migration-plan-limits.adoc[leveloffset=+1] diff --git a/modules/migration-adding-cluster-to-cam.adoc b/modules/migration-adding-cluster-to-cam.adoc index 3ece0889a5..f93a765df6 100644 --- a/modules/migration-adding-cluster-to-cam.adoc +++ b/modules/migration-adding-cluster-to-cam.adoc @@ -6,9 +6,9 @@ [id='migration-adding-cluster-to-cam_{context}'] = Adding a cluster to the CAM web console -You can add a source cluster to the CAM web console. +You can add a cluster to the CAM web console. -.Prerequisites for Azure +.Prerequisites If you are using Azure snapshots to copy data: @@ -17,7 +17,7 @@ If you are using Azure snapshots to copy data: .Procedure -. Log in to the source cluster. +. Log in to the cluster. . Obtain the service account token: + ---- @@ -34,6 +34,7 @@ eyJhbGciOiJSUzI1NiIsImtpZCI6IiJ9.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiw * *Service account token*: String that you obtained from the source cluster. * *Azure cluster*: Optional. Select it if you are using Azure snapshots to copy your data. * *Azure resource group*: This field appears if *Azure cluster* is checked. +* If you use a custom CA bundle, click *Browse* and browse to the CA bundle file. . Click *Add cluster*. + diff --git a/modules/migration-adding-replication-repository-to-cam.adoc b/modules/migration-adding-replication-repository-to-cam.adoc index 1bceaeab58..6ffd07750e 100644 --- a/modules/migration-adding-replication-repository-to-cam.adoc +++ b/modules/migration-adding-replication-repository-to-cam.adoc @@ -28,6 +28,7 @@ You can add an object storage bucket as a replication repository to the CAM web ** *S3 provider access key*: Specify the `` for AWS or the S3 provider access key for MCG. ** *S3 provider secret access key*: Specify the `` for AWS or the S3 provider secret access key for MCG. ** *Require SSL verification*: Clear this check box if you are using a generic S3 provider. +** If you use a custom CA bundle, click *Browse* and browse to the Base64-encoded CA bundle file. * *GCP*: diff --git a/modules/migration-creating-ca-bundle.adoc b/modules/migration-creating-ca-bundle.adoc new file mode 100644 index 0000000000..74dac9b575 --- /dev/null +++ b/modules/migration-creating-ca-bundle.adoc @@ -0,0 +1,21 @@ +// Module included in the following assemblies: +// migration/migrating_3_4/migrating-applications-with-cam.adoc +// migration/migrating_4_1_4/migrating-applications-with-cam.adoc +// migration/migrating_4_2_4/migrating-applications-with-cam.adoc +[id='creating-ca-bundle_{context}'] += Creating a CA certificate bundle file + +If you use a self-signed certificate to secure a cluster or a replication repository, certificate verification may fail with the following error message: `Certificate signed by unknown authority`. + +You can create a custom CA certificate bundle file and upload it in the CAM web console when you add a cluster or a replication repository. + +.Procedure + +Download a CA certificate from a remote endpoint and save it as a CA bundle file: + +---- +$ echo -n | openssl s_client -connect : \ <1> + | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' > <2> +---- +<1> Specify the host FQDN and port of the endpoint, for example, `api.my-cluster.example.com:6443`. +<2> Specify the name of the CA bundle file.