From 578facc7b5c13efe8a0c32d6a81eea00ea946cfa Mon Sep 17 00:00:00 2001 From: Pranav Gaikwad Date: Thu, 28 Jan 2021 12:31:24 -0500 Subject: [PATCH] add dim/dvm configuration --- config/mig_controller.yml.example | 1 + roles/migration_prepare/templates/mig-cluster-remote.yml.j2 | 1 + roles/migration_run/defaults/main.yml | 2 ++ roles/migration_run/templates/mig-migration-stage.yml.j2 | 3 ++- roles/migration_run/templates/mig-migration.yml.j2 | 3 ++- 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/config/mig_controller.yml.example b/config/mig_controller.yml.example index c243b8c..7f52f48 100644 --- a/config/mig_controller.yml.example +++ b/config/mig_controller.yml.example @@ -4,3 +4,4 @@ mig_controller_aws_secret_key: mig_controller_aws_bucket_name: velero-903889c1a2xxxxxxxx mig_controller_aws_bucket_region: us-east-1 mig_controller_sa_token: +mig_controller_remote_cluster_registry_url: https://docker-registry-default.apps...com \ No newline at end of file diff --git a/roles/migration_prepare/templates/mig-cluster-remote.yml.j2 b/roles/migration_prepare/templates/mig-cluster-remote.yml.j2 index 771d2c5..bce1bbb 100644 --- a/roles/migration_prepare/templates/mig-cluster-remote.yml.j2 +++ b/roles/migration_prepare/templates/mig-cluster-remote.yml.j2 @@ -16,3 +16,4 @@ spec: namespace: {{ migration_namespace }} url: {{ mig_controller_remote_cluster_url }} + exposedRegistryPath: {{ mig_controller_remote_cluster_registry_url }} diff --git a/roles/migration_run/defaults/main.yml b/roles/migration_run/defaults/main.yml index b4f84b5..6a5ed13 100644 --- a/roles/migration_run/defaults/main.yml +++ b/roles/migration_run/defaults/main.yml @@ -2,3 +2,5 @@ mig_velero_timeout: 10 # If true, we will wait for a warning to be displayed before running the migration plan. wait_for_warnings: false +use_indirect_image_migration: false +use_indirect_volume_migration: false diff --git a/roles/migration_run/templates/mig-migration-stage.yml.j2 b/roles/migration_run/templates/mig-migration-stage.yml.j2 index 46da185..580046f 100644 --- a/roles/migration_run/templates/mig-migration-stage.yml.j2 +++ b/roles/migration_run/templates/mig-migration-stage.yml.j2 @@ -11,4 +11,5 @@ spec: migPlanRef: name: {{ migration_plan_name }} namespace: {{ migration_namespace }} - + indirectVolumeMigration: {{ use_indirect_volume_migration }} + indirectImageMigration: {{ use_indirect_image_migration }} diff --git a/roles/migration_run/templates/mig-migration.yml.j2 b/roles/migration_run/templates/mig-migration.yml.j2 index adb4aa1..9f334da 100644 --- a/roles/migration_run/templates/mig-migration.yml.j2 +++ b/roles/migration_run/templates/mig-migration.yml.j2 @@ -13,4 +13,5 @@ spec: migPlanRef: name: {{ migration_plan_name }} namespace: {{ migration_namespace }} - + indirectVolumeMigration: {{ use_indirect_volume_migration }} + indirectImageMigration: {{ use_indirect_image_migration }}