More changes

Signed-off-by: doxiao <[email protected]>

Author: doxiao

kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/README.md

@@ -93,8 +93,12 @@ The following parameters can be provided in the inputs file.
 | `clusterName` | Name of the WebLogic cluster instance to generate for the domain. | `cluster-1` |
 | `configuredManagedServerCount` | Number of Managed Server instances to generate for the domain. | `5` |
 | `domainHomeImageBase` | Base WebLogic binary image used to build the WebLogic domain image. The operator requires WebLogic Server 12.2.1.3.0 with patch 28076014 applied. Refer to [Weblogic Docker images](../../../../../site/weblogic-docker-images.md) for details on how to create one. If a different `domainHomeImageBase` (see Configuration table below) is specified, the specified image needs to be built locally or pulled from a repository before the `create-domain.sh` script is executed. | |
+<<<<<<< HEAD
 | `domainHomeImageBuildPath` | Location of the WebLogic "domain home in image" Docker image in `https://github.com/oracle/docker-images.git` project. If not specified, use "./docker-images/OracleWebLogic/samples/12213-domain-home-in-image-wdt". Another possible value is "./docker-images/OracleWebLogic/samples/12213-domain-home-in-image" which uses WLST scripts, instead of WDT, to generate the domain configuration. | `./docker-images/OracleWebLogic/samples/12213-domain-home-in-image-wdt` |
 | `domainPVMountPath` | Mount path of the domain persistent volume. | `/shared` |
+=======
+| `domainHomeImageBuildPath` | Location of the WebLogic "domain home in image" Docker image in `https://github.com/oracle/docker-images.git` project. If not specified, use "./docker-images/OracleWebLogic/samples/12213-domain-home-in-image". Another possible value is "./docker-images/OracleWebLogic/samples/12213-domain-home-in-image-wdt" which uses WDT scripts, instead of WLST, to generate the domain configuration. | `./docker-images/OracleWebLogic/samples/12213-domain-home-in-image` |
+>>>>>>> More changes
 | `domainUID` | Unique ID that will be used to identify this particular domain. Used as the name of the generated WebLogic domain as well as the name of the Kubernetes domain resource. This ID must be unique across all domains in a Kubernetes cluster. This ID cannot contain any character that is not valid in a Kubernetes service name. | `domain1` |
 | `exposeAdminNodePort` | Boolean indicating if the Administration Server is exposed outside of the Kubernetes cluster. | `false` |
 | `exposeAdminT3Channel` | Boolean indicating if the T3 administrative channel is exposed outside the Kubernetes cluster. | `false` |

kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/create-domain-inputs.yaml

@@ -115,8 +115,7 @@ domainPVMountPath: /shared
 
 # Location of the WebLogic "domain home in image" Docker image sample in the 
 # `https://github.com/oracle/docker-images.git` project.
-# If not specified, use "./docker-images/OracleWebLogic/samples/12213-domain-home-in-image-wdt".
-# Another possible value is "./docker-images/OracleWebLogic/samples/12213-domain-home-in-image",
-# which uses a WLST script, instead of WDT, to generate the domain configuration.
-domainHomeImageBuildPath: ./docker-images/OracleWebLogic/samples/12213-domain-home-in-image-wdt
-
+# If not specified, use "./docker-images/OracleWebLogic/samples/12213-domain-home-in-image".
+# Another possible value is "./docker-images/OracleWebLogic/samples/12213-domain-home-in-image-wdt",
+# which uses a WDT script, instead of WLST, to generate the domain configuration.
+domainHomeImageBuildPath: ./docker-images/OracleWebLogic/samples/12213-domain-home-in-image

kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/properties-template.properties

@@ -11,6 +11,7 @@ DB_PORT=1527
 DEBUG_FLAG=true
 DERBY_FLAG=true
 PRODUCTION_MODE_ENABLED=%PRODUCTION_MODE_ENABLED%
+CLUSTER_TYPE=%CLUSTER_TYPE%
 JAVA_OPTIONS=%JAVA_OPTIONS%
 T3_CHANNEL_PORT=%T3_CHANNEL_PORT%
 T3_PUBLIC_ADDRESS=%T3_PUBLIC_ADDRESS%

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain.sh

@@ -146,12 +146,16 @@ function createDomainConfigmap {
     cp ${scriptDir}/common/* ${externalFilesTmpDir}/
   fi
   cp ${domainOutputDir}/create-domain-inputs.yaml ${externalFilesTmpDir}/
-
+ 
   # Set the domainName in the inputs file that is contained in the configmap.
   # this inputs file can be used by the scripts, such as WDT, that creates the WebLogic
   # domain in the job.
   echo domainName: $domainName >> ${externalFilesTmpDir}/create-domain-inputs.yaml
 
+  if [ -f ${externalFilesTmpDir}/prepare.sh ]; then
+   sh ${externalFilesTmpDir}/prepare.sh -t ${clusterType} -i ${externalFilesTmpDir}
+  fi
+ 
   # create the configmap and label it properly
   local cmName=${domainUID}-create-weblogic-sample-domain-job-cm
   kubectl create configmap ${cmName} -n $namespace --from-file $externalFilesTmpDir

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/wdt/prepare.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+# Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+#
+
+# Perform preparation based on the specified cluster type
+
+function usage {
+  echo usage: ${script} -t clusterTpe -i file [-h]
+  echo "  -i Directory, must be specified."
+  echo "  -t Cluster type, CONFIGURED or DYNAMIC, default is DYNAMIC."
+  echo "  -h Help"
+  exit $1
+}
+
+
+while getopts "hi:t:" opt; do
+  case $opt in
+    i) externalFilesTmpDir="${OPTARG}"
+    ;;
+    t) clusterType="${OPTARG}"
+    ;;
+    h) usage 0
+    ;;
+    *) usage 1
+    ;;
+  esac
+done
+
+echo Preparing the scripts with clusterType $clusterType
+
+if [ "${clusterType}" = "CONFIGURED" ]; then
+  source_model=${externalFilesTmpDir}/wdt_model_configured.yaml
+else
+  source_model=${externalFilesTmpDir}/wdt_model_dynamic.yaml
+fi
+
+cp $source_model ${externalFilesTmpDir}/wdt_model.yaml
+