Fix for admin server targeted to JDBC resources (#809)

Author: CarolynRountree

core/src/main/python/wlsdeploy/tool/create/domain_creator.py

@@ -469,6 +469,9 @@ def __extend_domain(self, domain_home):
             self.wlst_helper.add_template(custom_template)
 
         topology_folder_list = self.aliases.get_model_topology_top_level_folder_names()
+
+        resources_dict = self.model.get_model_resources()
+        jdbc_names = self.topology_helper.create_placeholder_jdbc_resources(resources_dict)
         self.__create_machines_clusters_and_servers(delete_now=False)
         self.__configure_fmw_infra_database()
 
@@ -485,6 +488,9 @@ def __extend_domain(self, domain_home):
         self.logger.info('WLSDPLY-12209', self._domain_name,
                          class_name=self.__class_name, method_name=_method_name)
 
+        # targets may have been inadvertently assigned when clusters were added
+        self.topology_helper.clear_jdbc_placeholder_targeting(jdbc_names)
+
         self.__apply_base_domain_config(topology_folder_list)
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return
@@ -543,6 +549,8 @@ def __extend_domain_with_select_template(self, domain_home):
         self.__create_security_folder()
         topology_folder_list.remove(SECURITY)
 
+        resources_dict = self.model.get_model_resources()
+        jdbc_names = self.topology_helper.create_placeholder_jdbc_resources(resources_dict)
         self.__create_machines_clusters_and_servers(delete_now=False)
 
         server_groups_to_target = self._domain_typedef.get_server_groups_to_target()
@@ -557,6 +565,9 @@ def __extend_domain_with_select_template(self, domain_home):
         if len(dynamic_assigns) > 0:
             self.target_helper.target_dynamic_server_groups(dynamic_assigns)
 
+        # targets may have been inadvertently assigned when clusters were added
+        self.topology_helper.clear_jdbc_placeholder_targeting(jdbc_names)
+
         self.__apply_base_domain_config(topology_folder_list)
 
         self.logger.info('WLSDPLY-12205', self._domain_name, domain_home,
@@ -791,8 +802,7 @@ def __create_machines_clusters_and_servers(self, delete_now=True):
         self.topology_helper.create_placeholder_server_templates(self._topology)
 
         # create placeholders for JDBC resources that may be referenced in cluster definition.
-        resources_dict = self.model.get_model_resources()
-        jdbc_names = self.topology_helper.create_placeholder_jdbc_resources(resources_dict)
+
         cluster_nodes = dictionary_utils.get_dictionary_element(self._topology, CLUSTER)
         if len(cluster_nodes) > 0:
             self._create_named_mbeans(CLUSTER, cluster_nodes, location, log_created=True, delete_now=delete_now)
@@ -814,9 +824,8 @@ def __create_machines_clusters_and_servers(self, delete_now=True):
         if len(server_nodes) > 0:
             self._create_named_mbeans(SERVER, server_nodes, location, log_created=True, delete_now=delete_now)
 
-        # targets may have been inadvertently assigned when clusters were added
-        self.topology_helper.clear_jdbc_placeholder_targeting(jdbc_names)
         self.__create_migratable_targets(location, delete_now=delete_now)
+
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return