Rname inputs directory to images.

Author: skommala

README.md

@@ -72,7 +72,7 @@ Resolving deltas: 100% (1735/1735), done.
 $ cd weblogic-server-for-oci/terraform
 $ ls
 autoscaling_variables.tf  data_sources.tf  edition.tf        idcs_variables.tf  locals.tf  modules/         network_variables.tf        oci_images.tf  outputs.tf   schema.yaml        variables.tf  weblogic_variables.tf
-bastion_variables.tf      db_variables.tf  fss_variables.tf  inputs/            main.tf    mp_variables.tf  observability_variables.tf  orm/           provider.tf  schema_14110.yaml  versions.tf
+bastion_variables.tf      db_variables.tf  fss_variables.tf  images/            main.tf    mp_variables.tf  observability_variables.tf  orm/           provider.tf  schema_14110.yaml  versions.tf
 $
 ```
 
@@ -171,17 +171,17 @@ First, you need to set the image variables, depending on which WebLogic edition
 BYOL license or UCM license, when creating the stack.
 
 The following files contain the values for those variables:
-- [mp_image_se_byol.tfvars](./terraform/inputs/mp_image_se_byol.tfvars): WebLogic Standard Edition - BYOL
-- [mp_image_ee_byol.tfvars](./terraform/inputs/mp_image_ee_byol.tfvars): WebLogic Enterprise Edition - BYOL
-- [mp_image_ee_ucm.tfvars](./terraform/inputs/mp_image_ee_ucm.tfvars): WebLogic Enterprise Edition - UCM
-- [mp_image_suite_byol.tfvars](./terraform/inputs/mp_image_suite_byol.tfvars): WebLogic Suite - BYOL
-- [mp_image_suite_ucm.tfvars](./terraform/inputs/mp_image_suite_ucm.tfvars): WebLogic Suite - UCM
+- [mp_image_se_byol.tfvars](./terraform/images/mp_image_se_byol.tfvars): WebLogic Standard Edition - BYOL
+- [mp_image_ee_byol.tfvars](./terraform/images/mp_image_ee_byol.tfvars): WebLogic Enterprise Edition - BYOL
+- [mp_image_ee_ucm.tfvars](./terraform/images/mp_image_ee_ucm.tfvars): WebLogic Enterprise Edition - UCM
+- [mp_image_suite_byol.tfvars](./terraform/images/mp_image_suite_byol.tfvars): WebLogic Suite - BYOL
+- [mp_image_suite_ucm.tfvars](./terraform/images/mp_image_suite_ucm.tfvars): WebLogic Suite - UCM
 
 To use one of the files above:
-- Copy the file from the `terraform/inputs` directory, to the `terraform` directory
+- Copy the file from the `terraform/images` directory, to the `terraform` directory
 - Rename the file from `terraform/mp_image_<edition>_<license>.tfvars` to `terraform/mp_image_<edition>_<license>.auto.tfvars`
 
-For example, if you want to create a WebLogic Enterprise Edition UCM stack, copy the file `terraform/inputs/mp_image_ee_ucm.tfvars`
+For example, if you want to create a WebLogic Enterprise Edition UCM stack, copy the file `terraform/images/mp_image_ee_ucm.tfvars`
 to `terraform/mp_image_ee_ucm.auto.tfvars`
 
 Next, you need to configure [variables](./VARIABLES.md) to drive the stack creation. This can be done by creating a
@@ -322,4 +322,4 @@ When you no longer need the deployment, you can run a
 [marketplace]: https://docs.oracle.com/iaas/Content/Marketplace/Concepts/marketoverview.htm
 [orm]: https://docs.cloud.oracle.com/iaas/Content/ResourceManager/Concepts/resourcemanager.htm
 [vault]: https://docs.cloud.oracle.com/iaas/Content/KeyManagement/Concepts/keyoverview.htm
-[tf]: https://www.terraform.io
+[tf]: https://www.terraform.io

builds/build_cli.sh

@@ -68,7 +68,7 @@ mkdir -p ${SCRIPT_DIR}/binaries/tmpbuild
 
 create_cli_bundle()
 {
-  cp -Rf ${SCRIPT_DIR}/../terraform/modules ${SCRIPT_DIR}/../terraform/edition.tf ${SCRIPT_DIR}/../terraform/*.tf ${SCRIPT_DIR}/../terraform/inputs ${TMP_BUILD}
+  cp -Rf ${SCRIPT_DIR}/../terraform/modules ${SCRIPT_DIR}/../terraform/edition.tf ${SCRIPT_DIR}/../terraform/*.tf ${SCRIPT_DIR}/../terraform/images ${TMP_BUILD}
   replace_variables
   (cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-terraform.zip *; rm -Rf ${TMP_BUILD}/*)
 }

builds/build_mp_bundles.sh

@@ -186,7 +186,7 @@ create_byol_standard_14110()
 
 replace_byol_ee_12214_variables()
 {
-  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_ee_byol.tfvars
+  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_ee_byol.tfvars
   get_mp_values
   sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf
   sed -i '/variable "instance_image_id" {/!b;n;n;n;cdefault = '"$instance_image_id"'' ${TMP_BUILD}/mp_variables.tf
@@ -206,7 +206,7 @@ replace_byol_ee_12214_variables()
 }
 replace_byol_ee_14110_variables()
 {
-  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_ee_byol.tfvars
+  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_ee_byol.tfvars
   get_mp_values
   sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf
   sed -i '/variable "wls_version" {/!b;n;n;n;cdefault = \"14.1.1.0\"' ${TMP_BUILD}/weblogic_variables.tf
@@ -227,7 +227,7 @@ replace_byol_ee_14110_variables()
 }
 replace_byol_se_12214_variables()
 {
-  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_se_byol.tfvars
+  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_se_byol.tfvars
   get_mp_values
   sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf
   sed -i 's/default     = "EE"/default     = "SE"/' ${TMP_BUILD}/edition.tf
@@ -239,13 +239,13 @@ replace_byol_se_12214_variables()
   sed -i 's/#- ${use_autoscaling}/- ${use_autoscaling}/' ${TMP_BUILD}/schema.yaml
   sed -i ':a;$!{N;ba};s/- ${use_autoscaling}/#- ${use_autoscaling}/1' ${TMP_BUILD}/schema.yaml
   sed -i '/main_mktpl_image/ { n; s/ocid                  = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
-  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_ee_byol.tfvars
+  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_ee_byol.tfvars
   get_mp_values
   sed -i '/ucm_image/ { n; s/ocid                  = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
 }
 replace_byol_se_14110_variables()
 {
-  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_se_byol.tfvars
+  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_se_byol.tfvars
   get_mp_values
   sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf
   sed -i 's/default     = "EE"/default     = "SE"/' ${TMP_BUILD}/edition.tf
@@ -258,13 +258,13 @@ replace_byol_se_14110_variables()
   sed -i 's/#- ${use_autoscaling}/- ${use_autoscaling}/' ${TMP_BUILD}/schema_14110.yaml
   sed -i ':a;$!{N;ba};s/- ${use_autoscaling}/#- ${use_autoscaling}/1' ${TMP_BUILD}/schema_14110.yaml
   sed -i '/main_mktpl_image/ { n; s/ocid                  = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
-  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_ee_byol.tfvars
+  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_ee_byol.tfvars
   get_mp_values
   sed -i '/ucm_image/ { n; s/ocid                  = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
 }
 replace_byol_suite_12214_variables()
 {
-  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_suite_byol.tfvars
+  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_suite_byol.tfvars
   get_mp_values
   sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf
   sed -i 's/default     = "EE"/default     = "SUITE"/' ${TMP_BUILD}/edition.tf
@@ -285,7 +285,7 @@ replace_byol_suite_12214_variables()
 }
 replace_byol_suite_14110_variables()
 { 
-  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_suite_byol.tfvars
+  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_suite_byol.tfvars
   get_mp_values
   sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf
   sed -i 's/default     = "EE"/default     = "SUITE"/' ${TMP_BUILD}/edition.tf
@@ -307,7 +307,7 @@ replace_byol_suite_14110_variables()
 }
 replace_ucm_suite_12214_variables()
 {  
-  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_suite_ucm.tfvars
+  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_suite_ucm.tfvars
   get_mp_values
   sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf
   sed -i 's/default     = "EE"/default     = "SUITE"/' ${TMP_BUILD}/edition.tf
@@ -317,13 +317,13 @@ replace_ucm_suite_12214_variables()
   sed -i '/variable "listing_resource_version" {/!b;n;n;n;cdefault = '"$listing_resource_version"'' ${TMP_BUILD}/mp_variables.tf
   sed -i 's/#- ${instance_image_id}/- ${instance_image_id}/' ${TMP_BUILD}/schema.yaml
   sed -i '/main_mktpl_image/ { n; s/ocid                  = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
-  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_suite_byol.tfvars
+  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_suite_byol.tfvars
   get_mp_values
   sed -i '/ucm_image/ { n; s/ocid                  = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
 }
 replace_ucm_suite_14110_variables()
 { 
-  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_suite_ucm.tfvars
+  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_suite_ucm.tfvars
   get_mp_values
   sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf
   sed -i 's/default     = "EE"/default     = "SUITE"/' ${TMP_BUILD}/edition.tf
@@ -334,13 +334,13 @@ replace_ucm_suite_14110_variables()
   sed -i '/variable "listing_resource_version" {/!b;n;n;n;cdefault = '"$listing_resource_version"'' ${TMP_BUILD}/mp_variables.tf
   sed -i 's/#- ${instance_image_id}/- ${instance_image_id}/' ${TMP_BUILD}/schema_14110.yaml
   sed -i '/main_mktpl_image/ { n; s/ocid                  = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
-  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_suite_byol.tfvars
+  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_suite_byol.tfvars
   get_mp_values
   sed -i '/ucm_image/ { n; s/ocid                  = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
 }
 replace_ucm_ee_12214_variables()
 {
-  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_ee_ucm.tfvars
+  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_ee_ucm.tfvars
   get_mp_values
   sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf
   sed -i '/variable "instance_image_id" {/!b;n;n;n;cdefault = '"$instance_image_id"'' ${TMP_BUILD}/mp_variables.tf
@@ -349,13 +349,13 @@ replace_ucm_ee_12214_variables()
   sed -i '/variable "listing_resource_version" {/!b;n;n;n;cdefault = '"$listing_resource_version"'' ${TMP_BUILD}/mp_variables.tf
   sed -i 's/#- ${instance_image_id}/- ${instance_image_id}/' ${TMP_BUILD}/schema.yaml
   sed -i '/main_mktpl_image/ { n; s/ocid                  = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
-  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_ee_byol.tfvars
+  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_ee_byol.tfvars
   get_mp_values
   sed -i '/ucm_image/ { n; s/ocid                  = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
 }
 replace_ucm_ee_14110_variables()
 {
-  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_ee_ucm.tfvars
+  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_ee_ucm.tfvars
   get_mp_values
   sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf
   sed -i '/variable "wls_version" {/!b;n;n;n;cdefault = \"14.1.1.0\"' ${TMP_BUILD}/weblogic_variables.tf
@@ -365,7 +365,7 @@ replace_ucm_ee_14110_variables()
   sed -i '/variable "listing_resource_version" {/!b;n;n;n;cdefault = '"$listing_resource_version"'' ${TMP_BUILD}/mp_variables.tf
   sed -i 's/#- ${instance_image_id}/- ${instance_image_id}/' ${TMP_BUILD}/schema_14110.yaml
   sed -i '/main_mktpl_image/ { n; s/ocid                  = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
-  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_ee_byol.tfvars
+  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_ee_byol.tfvars
   get_mp_values
   sed -i '/ucm_image/ { n; s/ocid                  = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
 }

solutions/jrf/README.md

@@ -52,11 +52,11 @@ terraform init
 Update the variable values in tfvars files under directories terraform/solutions/common and terraform/solutions/jrf according to the user specific values
 Invoke apply passing all *.tfvars files as input
 ```bash
-terraform apply -var-file=../solutions/common/tenancy.tfvars -var-file=inputs/mp_image_ee_byol.tfvars -var-file=../solutions/jrf/jrf_instance.tfvars -var-file=../solutions/jrf/existing_lb.tfvars -var-file=../solutions/jrf/idcs.tfvars var-file=../solutions/jrf/oci_db.tfvars
+terraform apply -var-file=../solutions/common/tenancy.tfvars -var-file=images/mp_image_ee_byol.tfvars -var-file=../solutions/jrf/jrf_instance.tfvars -var-file=../solutions/jrf/existing_lb.tfvars -var-file=../solutions/jrf/idcs.tfvars var-file=../solutions/jrf/oci_db.tfvars
 ```
 
 To destroy the infrastructure
 ```bash
-terraform destroy var-file=../solutions/common/tenancy.tfvars -var-file=inputs/mp_image_ee_byol.tfvars -var-file=../solutions/jrf/jrf_instance.tfvars -var-file=../solutions/jrf/existing_lb.tfvars -var-file=../solutions/jrf/idcs.tfvars var-file=../solutions/jrf/oci_db.tfvars
+terraform destroy var-file=../solutions/common/tenancy.tfvars -var-file=images/mp_image_ee_byol.tfvars -var-file=../solutions/jrf/jrf_instance.tfvars -var-file=../solutions/jrf/existing_lb.tfvars -var-file=../solutions/jrf/idcs.tfvars var-file=../solutions/jrf/oci_db.tfvars
 ```
-**Important:** Refer to [documentation](https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/delete-domain.html) for steps to perform before running *terraform destroy*.
+**Important:** Refer to [documentation](https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/delete-domain.html) for steps to perform before running *terraform destroy*.

solutions/non_jrf/README.md

@@ -50,11 +50,11 @@ terraform init
 Update the variable values in tfvars files under directories terraform/solutions/common and terraform/solutions/non_jrf according to the user specific values
 Invoke apply passing all *.tfvars files as input
 ```bash
-terraform apply -var-file=../solutions/common/tenancy.tfvars -var-file=inputs/mp_image_ee_byol.tfvars -var-file=../solutions/non_jrf/nonjrf_instance.tfvars -var-file=../solutions/non_jrf /lb.tfvars -var-file=../solutions/non_jrf/fss.tfvars
+terraform apply -var-file=../solutions/common/tenancy.tfvars -var-file=images/mp_image_ee_byol.tfvars -var-file=../solutions/non_jrf/nonjrf_instance.tfvars -var-file=../solutions/non_jrf/lb.tfvars -var-file=../solutions/non_jrf/fss.tfvars
 ```
 
 To destroy the infrastructure
 ```bash
-terraform destroy -var-file=../solutions/common/tenancy.tfvars -var-file=../solutions/common/mp_byol.tfvars -var-file=../solutions/non_jrf/nonjrf_instance.tfvars -var-file=../solutions/non_jrf/lb.tfvars -var-file=../solutions/non_jrf/fss.tfvars
+terraform destroy -var-file=../solutions/common/tenancy.tfvars -var-file=images/mp_image_ee_byol.tfvars -var-file=../solutions/non_jrf/nonjrf_instance.tfvars -var-file=../solutions/non_jrf/lb.tfvars -var-file=../solutions/non_jrf/fss.tfvars
 ```
 **Important:** Refer to [documentation](https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/delete-domain.html) for steps to perform before running *terraform destroy*.