Merge branch 'master' into dev

Author: Marcelo RS Soares

dbaas/drivers/replication_topologies/mysql.py

@@ -562,10 +562,10 @@ def get_deploy_steps(self):
                 'workflow.steps.util.ssl.UpdateExpireAtDate',
             )}, {
             'Starting database': (
-                'workflow.steps.util.plan.ConfigureForNewInfra',
-                'workflow.steps.util.plan.ConfigureLogForNewInfra',
+                'workflow.steps.util.plan.ConfigureForNewInfra', # mysql_foxha_57_configuration.sh
+                'workflow.steps.util.plan.ConfigureLogForNewInfra', # rsyslog_config.sh
                 'workflow.steps.util.metric_collector.ConfigureTelegraf',
-                'workflow.steps.util.database.Start',
+                'workflow.steps.util.database.Start', # start database
                 'workflow.steps.util.metric_collector.RestartTelegraf',
                 'workflow.steps.util.database.StartRsyslog',
                 'workflow.steps.util.database.CheckIsUp',
@@ -1074,30 +1074,22 @@ def get_update_ssl_steps(self):
             'Disable monitoring and alarms': (
                 'workflow.steps.util.zabbix.DisableAlarms',
                 'workflow.steps.util.db_monitor.DisableMonitoring',
+                'workflow.steps.util.ssl.UpdateExpireAtDateRollback',
+                'workflow.steps.util.ssl.BackupSSLFolder',
             ),
         }] + [{
             'Disable SSL': (
                 'workflow.steps.util.ssl.UnSetReplicationUserRequireSSL',
             ),
         }] + [{
             'Configure SSL': (
-                'workflow.steps.util.ssl.UpdateExpireAtDateRollback',
-                'workflow.steps.util.ssl.MoveSSLFolder',
-                'workflow.steps.util.ssl.UpdateOpenSSlLib',
-                'workflow.steps.util.ssl.CreateSSLFolder',
-                'workflow.steps.util.ssl.CreateSSLConfForInfraEndPoint',
-                'workflow.steps.util.ssl.CreateSSLConfForInstanceIP',
-                'workflow.steps.util.ssl.RequestSSLForInfra',
-                'workflow.steps.util.ssl.RequestSSLForInstance',
+                'workflow.steps.util.ssl.UpdateSSLForInfra',
+                'workflow.steps.util.ssl.UpdateSSLForInstance',
                 'workflow.steps.util.ssl.CreateJsonRequestFileInfra',
                 'workflow.steps.util.ssl.CreateJsonRequestFileInstance',
                 'workflow.steps.util.ssl.CreateCertificateInfra',
                 'workflow.steps.util.ssl.CreateCertificateInstance',
                 'workflow.steps.util.ssl.SetSSLFilesAccessMySQL',
-                'workflow.steps.util.ssl.SetInfraConfiguredSSL',
-                'workflow.steps.util.plan.Configure',
-                'workflow.steps.util.plan.ConfigureLog',
-                'workflow.steps.util.metric_collector.ConfigureTelegraf',
                 'workflow.steps.util.ssl.UpdateExpireAtDate',
             ),
         }] + [{
@@ -1106,7 +1098,7 @@ def get_update_ssl_steps(self):
                 'workflow.steps.util.vm.ChangeMaster',
                 'workflow.steps.util.database.CheckIfSwitchMaster',
                 'workflow.steps.util.database.Stop',
-                # 'workflow.steps.util.ssl.RestoreSSLFolder4Rollback',
+                'workflow.steps.util.ssl.RestoreSSLFolder4Rollback',
                 'workflow.steps.util.database.Start',
                 'workflow.steps.util.metric_collector.RestartTelegraf',
                 'workflow.steps.util.database.CheckIfSwitchMasterRollback',
@@ -1120,7 +1112,6 @@ def get_update_ssl_steps(self):
             ),
         }] + [{
             'Enabling monitoring and alarms': (
-                'workflow.steps.util.db_monitor.UpdateInfraSSLMonitor',
                 'workflow.steps.util.db_monitor.EnableMonitoring',
                 'workflow.steps.util.zabbix.EnableAlarms',
             ),