1 files changed, 10 insertions, 4 deletions
diff --git a/base/server/python/pki/server/deployment/pkihelper.py b/base/server/python/pki/server/deployment/pkihelper.py
index 1b2324f6d..24e6ee0c2 100644
--- a/base/server/python/pki/server/deployment/pkihelper.py
+++ b/base/server/python/pki/server/deployment/pkihelper.py
@@ -3818,12 +3818,18 @@ class ConfigClient:
         try:
             client = pki.system.SystemConfigClient(connection)
             client.configure(data)
-            client.createUsers()
-            client.configureSecurityDomain()
-            response = client.finalize()
+
+            if not (self.external or self.standalone) or self.external_step_two:
+                client.createCertificates()
+                client.backupKeys()
+                client.createUsers()
+                client.configureSecurityDomain()
+                client.finalizeConfiguration()
+
+            response = client.getConfigurationResult()
 
             config.pki_log.debug(
-                log.PKI_CONFIG_RESPONSE_STATUS + " " + str(response['status']),
+                'Configuration complete',
                 extra=config.PKI_INDENTATION_LEVEL_2)
             try:
                 certs = response['systemCerts']