diff --git a/dbaas/logical/templates/logical/database/details/migrate_tab.html b/dbaas/logical/templates/logical/database/details/migrate_tab.html
index aa6f22b07..b8c68f6aa 100644
--- a/dbaas/logical/templates/logical/database/details/migrate_tab.html
+++ b/dbaas/logical/templates/logical/database/details/migrate_tab.html
@@ -122,7 +122,7 @@
Regions
{% endfor %}
{% endif %}
-
+
@@ -270,7 +270,7 @@ Regions
status_migrate("migrate_region_btn", "DISABLE", "DISABLE");
}
else {
- status_migrate("migrate_region_btn", "DISABLE", "FALSE");
+ status_migrate("migrate_region_btn", "DISABLE", "DISABLE");
}
});
diff --git a/dbaas/notification/tasks.py b/dbaas/notification/tasks.py
index c9ec6ccb7..8305ce5bb 100644
--- a/dbaas/notification/tasks.py
+++ b/dbaas/notification/tasks.py
@@ -2382,6 +2382,7 @@ def region_migrate(cls, database, environment, offering, user, hosts_zones, flag
args = "Database: {}, Environment: {}, Migration Stage: {}".format(database, environment, migration_stage)
task_params = {
'task_name': "region_migrate",
+ 'database': database,
'arguments': args,
}
if user:
@@ -2408,6 +2409,7 @@ def region_migrate_rollback(cls, database, user, step_manager=None, migration_st
)
task_params = {
'task_name': "region_migrate_rollback",
+ 'database': database,
'arguments': args,
}
if user:
@@ -2509,6 +2511,7 @@ def database_migrate(
args = "Database: {}, Environment: {}, Migration Stage: {}".format(database, new_environment, migration_stage)
task_params = {
'task_name': "database_migrate",
+ 'database': database,
'arguments': args,
}
if user:
@@ -2537,6 +2540,7 @@ def database_migrate_rollback(cls, database, user, step_manager=None, migration_
)
task_params = {
'task_name': "database_migrate_rollback",
+ 'database': database,
'arguments': args,
}
if user:
@@ -2563,7 +2567,6 @@ def update_database_monitoring(cls, database, hostgroup, action):
}
task = cls.create_task(task_params)
-
update_database_monitoring.delay(task=task, database=database, hostgroup=hostgroup, action=action,)
@classmethod
@@ -2577,7 +2580,6 @@ def update_organization_name_monitoring(cls, database, organization_name):
}
task = cls.create_task(task_params)
-
update_organization_name_monitoring.delay(task=task, database=database, organization_name=organization_name)
@classmethod
@@ -2612,7 +2614,6 @@ def database_change_persistence(cls, database, user, since_step=None):
}
delay_params.update(**{'since_step': since_step} if since_step else {})
-
change_database_persistence.delay(**delay_params)
@classmethod
@@ -2639,7 +2640,6 @@ def database_set_ssl_required(cls, database, user, since_step=None):
}
delay_params.update(**{'since_step': since_step} if since_step else {})
-
database_set_ssl_required.delay(**delay_params)
@classmethod
@@ -2666,7 +2666,6 @@ def database_set_ssl_not_required(cls, database, user, since_step=None):
}
delay_params.update(**{'since_step': since_step} if since_step else {})
-
database_set_ssl_not_required.delay(**delay_params)
# ============ END TASKS ============