Merge branch 'main' into security-oci-security-health-check.update-240305

Author: AlexanderHodicke

.gitignore

@@ -3,6 +3,7 @@
 .AppleDouble
 .LSOverride
 .vscode
+.bak
 
 # Icon must end with two \r
 Icon

cloud-infrastructure/vmware-solutions/oracle-cloud-vmware-solution/OCVS-Terraform-automation/AddHost-MultiAD/esxi_host.tf

@@ -0,0 +1,7 @@
+resource "oci_ocvp_esxi_host" "test_esxi_host" {
+    cluster_id = var.SDDC_Cluster_OCID
+    compute_availability_domain = var.AD
+    display_name = var.ESXi_hostname
+    host_shape_name = var.shape
+    host_ocpu_count = var.OCPU_count
+}

cloud-infrastructure/vmware-solutions/oracle-cloud-vmware-solution/OCVS-Terraform-automation/AddHost-MultiAD/provider.tf

@@ -0,0 +1,3 @@
+provider oci {
+	region = var.region
+}

cloud-infrastructure/vmware-solutions/oracle-cloud-vmware-solution/OCVS-Terraform-automation/AddHost-MultiAD/vars.tf

@@ -0,0 +1,11 @@
+variable region {default = "your_region"}
+variable SDDC_Cluster_OCID {default = "OCID of your Cluster (not SDDC)"}
+variable ESXi_hostname {default = "ESXi-hostname"}
+variable shape {default = "BM.DenseIO.E4.128"}  # possible: "BM.DenseIO.E4.128" or "BM.DenseIO2.52"
+variable OCPU_count {default = 32}  # For AMD only, possible: 32, 64 or 128
+
+# You need to specify the full name of your AD!!
+# so for example "EU-FRANKFURT-1-AD-3" it NOT correct, it need to look like "ABCd:EU-FRANKFURT-1-AD-3"
+# You can run the below command from the OCI CLI or cloud shell to see your AD names:
+# oci iam availability-domain list
+variable AD {default = "your_full-region-and-AD-name"}

cloud-infrastructure/vmware-solutions/oracle-cloud-vmware-solution/OCVS-Terraform-automation/README.md

@@ -1,14 +1,15 @@
 # Oracle Cloud VMware Solution - Terraform Automation
 
 Terraform can be used both to provision and manage an OCVS environment. In the folders in this directory 
-you will find examples for both scenarios:
+you will find examples for various scenarios:
 
 - Provisioning OCVS through terraform (3 different scenarios are included)
+- Adding an ESXi host to a multi-ad deployment, with the option to specify it's AD location
 - Manage OCVS (2-day operations), creating a new VLAN and attaching it to the OCVS environment
 
 Examples created by: [email protected] (feedback welcome!)
 
 # License
 Copyright (c) 2024 Oracle and/or its affiliates.
 Licensed under the Universal Permissive License (UPL), Version 1.0.
-See [LICENSE](https://github.com/oracle-devrel/technology-engineering/blob/main/LICENSE) for more details.
+See [LICENSE](https://github.com/oracle-devrel/technology-engineering/blob/main/LICENSE) for more details.