Merge changes from pv-domain-simplify-doc-update-withsample-new branch.

Author: ankedia

documentation/site/content/managing-domains/domain-on-pv/domain-creation-images.md

@@ -3,30 +3,13 @@ title = "Domain creation images"
 date = 2019-02-23T16:45:16-05:00
 weight = 25
 pre = "<b> </b>"
-<<<<<<< HEAD
-description = "Domain creation images are used to supply the WDT artifacts for Domain on PV."
-=======
 description = "Domain creation images supply the WDT model for Domain on PV."
->>>>>>> origin/pv-domain-simplify-doc-update-withsample-new
 +++
 
 {{< table_of_contents >}}
 
 ### Introduction
 
-<<<<<<< HEAD
-Domain creation images are used for supplying model files, variable files,
-application archive files, and WebLogic Deploy Tooling (WDT) installation files when deploying a domain using
-a Domain on PV model.  You will distribute model files, application archives, and the
-WebLogic Deploy Tooling executable using these images.  Operator will use the WDT tool and artifacts to
-manage the domain.
-
-**Note:**  These images are _only_ used for creating the domain, and will not be used to update the domain.
-
-### Configuration
-
-You can configure one or more WDT artifacts images in a domain resource.
-=======
 Domain creation images are used for supplying WebLogic Deploy Tooling (WDT) model files, WDT variables files,
 WDT application archive files (collectively known as WDT model files), and WDT installation files when deploying a domain using
 a Domain on PV model.  You distribute WDT model files and the
@@ -38,20 +21,14 @@ manage the domain.
 ### Configuration
 
 You can configure one or more domain creation images in a domain resource.
->>>>>>> origin/pv-domain-simplify-doc-update-withsample-new
 
 Optionally, you can set the `imagePullPolicy`,
 which defaults to `Always` if the `image` ends in `:latest` and `IfNotPresent`,
 otherwise.
 If image pull secrets are required for pulling the images, then the secrets must be referenced using `domain.spec.imagePullSecrets`.
 
-<<<<<<< HEAD
-Also, optionally, you can configure the [source locations](#source-locations) of the WebLogic Deploy Tooling model
-and installation files in the image using the `sourceModelHome` and `sourceWDTInstallHome` fields, described in the following
-=======
 Also, optionally, you can configure the [source locations](#source-locations) of the WDT model
 and installation files in the image using the `sourceModelHome` and `sourceWDTInstallHome` fields, as described in this
->>>>>>> origin/pv-domain-simplify-doc-update-withsample-new
 [section](#source-locations).
 
 - For details about each field, see the [References](#references).
@@ -60,11 +37,7 @@ and installation files in the image using the `sourceModelHome` and `sourceWDTIn
 
 ### References
 
-<<<<<<< HEAD
-- Run the ` kubectl explain domain.spec.configuration.initializeDomainOnPV.domain.domainCreationImages` command or
-=======
 - Run the ` kubectl explain domain.spec.configuration.initializeDomainOnPV.domain.domainCreationImages` command, or
->>>>>>> origin/pv-domain-simplify-doc-update-withsample-new
 
 - See the `initializeDomainOnPV.domain.domainCreationImages` section
     in the domain resource
@@ -73,23 +46,13 @@ and installation files in the image using the `sourceModelHome` and `sourceWDTIn
 
 #### Source locations
 
-<<<<<<< HEAD
-Use the optional attributes `sourceModelHome` and
-`sourceWdtInstallHome` to specify non-default locations of
-WebLogic Deploy Tooling model and installation files in your image(s).
-Allowed values for `sourceModelHome` and `sourceWdtInstallHome`:
-- Unset - Defaults to `/auxiliary/models` and `/auxiliary/weblogic-deploy`, respectively.
-- Set to a path - Must point to an existing location containing WDT model and installation files, respectively.
-- `None` - Indicates that the image has no WDT models or installation files, respectively.
-=======
 Use the optional attributes, `sourceModelHome` and
 `sourceWdtInstallHome`, to specify non-default locations for the
 WDT model and installation files in your domain creation image(s).
 Allowed values for `sourceModelHome` and `sourceWdtInstallHome`:
 - Unset - Defaults to `/auxiliary/models` and `/auxiliary/weblogic-deploy`, respectively.
 - Set to a path - Must point to an existing location containing WDT model and WDT installation files, respectively.
 - `None` - Indicates that the image has no WDT model files and installation files, respectively.
->>>>>>> origin/pv-domain-simplify-doc-update-withsample-new
 
 If you set the `sourceModelHome` or `sourceWDTInstallHome` to `None` or,
 the source attributes are left unset and there are no files at the default locations,
@@ -105,15 +68,8 @@ For example source locations, see [Configuration example 2](#example-2-source-lo
 
 #### Multiple images
 
-<<<<<<< HEAD
-If specifying multiple images with model files in their respective `sourceModelHome`
-directories, then model files are merged.
-The operator will merge the model files from multiple images in the same order in which images appear under `model.auxiliaryImages` or `domain.domainCreationImages`.
-Files from later images in the merge overwrite same-named files from earlier images.
-=======
 If specifying multiple images with WDT model files in their respective `sourceModelHome`
 directories, then WDT model files are merged. Files from later images take precedence over files from earlier images.
->>>>>>> origin/pv-domain-simplify-doc-update-withsample-new
 
 When specifying multiple images, ensure that only one of the images supplies a WDT installation location using
 `sourceWDTInstallHome`.
@@ -144,11 +100,7 @@ spec:
 
 #### Example 2: Source locations
 
-<<<<<<< HEAD
-This example is same as Example 1 except that it specifies the source locations for the WebLogic Deploy Tooling model and installation files.
-=======
 This example is the same as Example 1, except that it specifies the source locations for the WDT model and installation files.
->>>>>>> origin/pv-domain-simplify-doc-update-withsample-new
 
 ```
 spec:
@@ -165,11 +117,7 @@ spec:
 
 This example is the same as Example 1, except it configures multiple images and sets the `sourceWDTInstallHome`
 for the second image to `None`.
-<<<<<<< HEAD
-In this case, the source location of the WebLogic Deploy Tooling installation from the second image `wdt-model-image2:v1` will be ignored.
-=======
 In this case, the source location of the WDT installation from the second image `wdt-model-image2:v1` will be ignored.
->>>>>>> origin/pv-domain-simplify-doc-update-withsample-new
 
 ```
 spec:

documentation/site/content/managing-domains/domain-on-pv/overview.md

@@ -10,35 +10,21 @@ description = "Learn how to create a domain on a persistent volume."
 
 ### Overview
 
-<<<<<<< HEAD
-Domain on persistent volume (Domain on PV) is one of the operator's [domain home source type]({{< relref "/managing-domains/choosing-a-model/_index.md" >}}) choices.
-Domain on PV requires that the domain home exists on a persistent volume. The domain home can be created either manually
-=======
 Domain on persistent volume (Domain on PV) is an operator [domain home source type]({{< relref "/managing-domains/choosing-a-model/_index.md" >}}),
 which requires that the domain home exists on a persistent volume. The domain home can be created either manually
->>>>>>> origin/pv-domain-simplify-doc-update-withsample-new
 or automatically by specifying the section, `domain.spec.configuration.initializeDomainOnPV`, in the domain resource YAML file.
 The initial domain topology and resources are described using [WebLogic Deploy Tooling (WDT) models](#weblogic-deploy-tooling-models).
 
 **NOTE**: The `initializeDomainOnPV` section provides a **one time only** domain home initialization.
 The operator creates the domain when the domain resource is first deployed. After the domain is created,
 this section is ignored. Subsequent domain life cycle updates must be controlled by
-<<<<<<< HEAD
-the WebLogic Server Administration Console, WebLogic Scripting Tool (WLST), or other mechanisms.  See the [High level use case](#high-level-use-case).
-=======
 the WebLogic Server Administration Console, the WebLogic Remote Console, WebLogic Scripting Tool (WLST), or other mechanisms.  See the [High level use case](#high-level-use-case).
->>>>>>> origin/pv-domain-simplify-doc-update-withsample-new
 
 The `initializeDomainOnPv` section:
 
 - Creates the PersistentVolume (PV) and/or PersistenVolumeClaim (PVC), if needed.
-<<<<<<< HEAD
-- Creates the JRF schema, if needed.
-- Creates the WebLogic domain home, based on the provided WDT models on the persistent volume.
-=======
 - Creates the RCU schema, if needed.
 - Creates the WebLogic domain home on the persistent volume based on the provided WDT models.
->>>>>>> origin/pv-domain-simplify-doc-update-withsample-new
 
 ### High level use case
 
@@ -47,24 +33,15 @@ The typical Domain on PV use case is for an application life cycle that requires
 For example, you might use frameworks like Meta Data Service (MDS), Oracle Application Development Framework (ADF), or Oracle Service Bus (OSB).
 These frameworks require a running domain and the lifecycle operations are persisted to the file system. Typically,
 after the initial domain is created, you use tools like Fusion Middleware Control, product-specific WLST functions,
-<<<<<<< HEAD
-the WebLogic Server Administration Console, the Service Bus Console, or JDeveloper for lifecycle operations. The changes are managed by
-=======
 the WebLogic Server Administration Console, the WebLogic Remote Console, the Service Bus Console, or JDeveloper for lifecycle operations. The changes are managed by
->>>>>>> origin/pv-domain-simplify-doc-update-withsample-new
 these tools; the data and operations _cannot_ be described using WDT models.
 
 ### WebLogic Deploy Tooling models
 
 WDT models are a convenient and simple alternative to WLST
 configuration scripts and templates.
-<<<<<<< HEAD
-They compactly define a WebLogic domain using YAML files and support including
-application archives in a ZIP file. For more information about the model format
-=======
 They compactly define a WebLogic domain using model files, variable properties files, and application archive files.
 For more information about the model format
->>>>>>> origin/pv-domain-simplify-doc-update-withsample-new
 and its integration,
 see [Usage]({{< relref "/managing-domains/domain-on-pv/usage.md" >}})
 and [Working with WDT Model files]({{< relref "/managing-domains/working-with-wdt-models/model-files.md" >}}).
@@ -76,32 +53,18 @@ The WDT model format is fully described in the open source,
 When you deploy a Domain on PV domain resource YAML file:
 
 - The operator will run a Kubernetes Job, called an introspector job, that:
-<<<<<<< HEAD
-    - Merges your WDT artifacts.
-    - Runs WDT tooling to generate a domain home.
-
-- After the introspector job completes:
-    - The operator creates a ConfigMap named `DOMAIN_UID-weblogic-domain-introspect-cm`
-      (possibly with some additional maps distinguished by serial names).
-=======
     - Merges your WDT model files.
     - Runs the WDT Create Domain Tool to create a domain home.
 
 - After the introspector job completes:
     - The operator creates one or more ConfigMaps following the pattern `DOMAIN_UID-weblogic-domain-introspect-cm***`.
->>>>>>> origin/pv-domain-simplify-doc-update-withsample-new
     - The operator subsequently boots your domain's WebLogic Server pods.
 
 ### Runtime updates
 
 You control runtime updates to the WebLogic domain configuration using tools, such as Fusion Middleware Control, product-specific WLST functions,
-<<<<<<< HEAD
-the WebLogic Server Administration Console, the Service Bus Console, or JDeveloper.  After the initial domain is created, subsequent updates to the
-source of the WDT artifacts or any referenced macros _will be ignored_.  
-=======
 the WebLogic Server Administration Console, the WebLogic Remote Console, the Service Bus Console, or JDeveloper.  After the initial domain is created, subsequent updates to the
 source of the WDT model files or any referenced macros _will be ignored_.  
->>>>>>> origin/pv-domain-simplify-doc-update-withsample-new
 
 Some changes may require triggering an introspector job.  For example: