Refactored replace_sslserver_cert() in configuration.py.

The replace_sslserver_cert() in configuration.py has been split into
separate methods for removing the temp SSL server cert and importing
the permanent SSL server cert.

https://pagure.io/dogtagpki/issue/2901

Change-Id: I35cb95e61959ff99c235f116304c7272a39694e5
(cherry picked from commit c86eb1b)

base/server/python/pki/server/deployment/scriptlets/configuration.py

@@ -899,7 +899,7 @@ def create_temp_sslserver_cert(self, deployer, instance, token):
         finally:
             nssdb.close()
 
-    def replace_sslserver_cert(self, deployer, instance, sslserver):
+    def remove_temp_sslserver_cert(self, deployer, instance, sslserver):
 
         if len(deployer.instance.tomcat_instance_subsystems()) == 1:
             # Modify contents of 'serverCertNick.conf' (if necessary)
@@ -922,6 +922,9 @@ def replace_sslserver_cert(self, deployer, instance, sslserver):
         finally:
             nssdb.close()
 
+    def import_perm_sslserver_cert(self, deployer, instance, sslserver):
+
+        nickname = sslserver['nickname']
         token = deployer.mdict['pki_token_name']
 
         config.pki_log.info(
@@ -1225,7 +1228,13 @@ def spawn(self, deployer):
         # replace it with the perm cert.
         if create_temp_sslserver_cert and sslserver and sslserver['cert']:
             deployer.systemd.stop()
-            self.replace_sslserver_cert(deployer, instance, sslserver)
+
+            # Remove temp SSL server cert.
+            self.remove_temp_sslserver_cert(deployer, instance, sslserver)
+
+            # Import perm SSL server cert.
+            self.import_perm_sslserver_cert(deployer, instance, sslserver)
+
             deployer.systemd.start()
 
         elif config.str2bool(deployer.mdict['pki_restart_configured_instance']):