Merge pull request #185 from oracle/no-machine

Don't create a machine per managed server as these had invalid NM listen addresses

Author: rjeberhard

kubernetes/internal/create-weblogic-domain-job-template.yaml

@@ -415,19 +415,6 @@ data:
     set('NodeManagerUsername', admin_username)
     set('NodeManagerPasswordEncrypted', admin_password)
 
-    # Configure machines
-    # ======================
-    for index in range(0, number_of_ms):
-
-      msIndex = index+1
-      machineName = '%DOMAIN_UID%-machine%s' % msIndex
-      cd('/')
-      create(machineName, 'Machine')
-      cd('Machine/%s' % machineName)
-      create(machineName, 'NodeManager')
-      cd('NodeManager/%s' % machineName)
-      set('ListenAddress', '%DOMAIN_UID%-%MANAGED_SERVER_NAME_BASE%%s' % msIndex)
-
     # Create a cluster
     cd('/')
     create(cluster_name, 'Cluster')
@@ -438,7 +425,6 @@ data:
 
       msIndex = index+1
       name = '%MANAGED_SERVER_NAME_BASE%%s' % msIndex
-      machineName = '%DOMAIN_UID%-machine%s' % msIndex
 
       create(name, 'Server')
       cd('/Servers/%s/' % name )
@@ -448,7 +434,6 @@ data:
       set('NumOfRetriesBeforeMSIMode', 0)
       set('RetryIntervalBeforeMSIMode', 1)
       set('Cluster', cluster_name)
-      set('Machine', machineName)
 
       create(name,'Log')
       cd('/Servers/%s/Log/%s' % (name, name))

operator/src/test/java/oracle/kubernetes/operator/create/CreateDomainGeneratedFilesBaseTest.java

@@ -316,11 +316,6 @@ protected void assertThatActualCreateDomainPyIsCorrect(String actualCreateDomain
         cd('/Servers/%ADMIN_SERVER_NAME%/Log/%ADMIN_SERVER_NAME%')
         set('FileName', '/shared/logs/%ADMIN_SERVER_NAME%.log')
         cd('/Security/%DOMAIN_NAME%/User/weblogic')
-          machineName = '%DOMAIN_UID%-machine%s' % msIndex
-          set('ListenAddress', '%DOMAIN_UID%-%MANAGED_SERVER_NAME_BASE%%s' % msIndex)
-          name = '%MANAGED_SERVER_NAME_BASE%%s' % msIndex
-          machineName = '%DOMAIN_UID%-machine%s' % msIndex
-          set('ListenAddress', '%DOMAIN_UID%-%s' % name)
         cmo.setProductionModeEnabled(%PRODUCTION_MODE_ENABLED%)
         asbpFile=open('%s/servers/%ADMIN_SERVER_NAME%/security/boot.properties' % domain_path, 'w+')
           secdir='%s/servers/%MANAGED_SERVER_NAME_BASE%%s/security' % (domain_path, index+1)
@@ -333,7 +328,6 @@ protected void assertThatActualCreateDomainPyIsCorrect(String actualCreateDomain
         getInputs().getAdminServerName(),
         getInputs().getManagedServerNameBase(),
         getInputs().getDomainUID() + "-" + getInputs().getAdminServerName(),
-        getInputs().getDomainUID() + "-" + getInputs().getManagedServerNameBase(),
         "setProductionModeEnabled\\(" + getInputs().getProductionModeEnabled() + "\\)",
         "server_port *= " + getInputs().getManagedServerPort(),
         "number_of_ms *= " + getInputs().getConfiguredManagedServerCount(),