pulumi-oci 1.33.0__py3-none-any.whl → 1.33.0a1713903118__py3-none-any.whl

pulumi_oci/core/outputs.py

@@ -2967,8 +2967,6 @@ class ComputeCapacityReservationInstanceReservationConfig(dict):
             suggest = "reserved_count"
         elif key == "clusterConfig":
             suggest = "cluster_config"
-        elif key == "clusterPlacementGroupId":
-            suggest = "cluster_placement_group_id"
         elif key == "faultDomain":
             suggest = "fault_domain"
         elif key == "instanceShapeConfig":
@@ -2991,7 +2989,6 @@ class ComputeCapacityReservationInstanceReservationConfig(dict):
                  instance_shape: str,
                  reserved_count: str,
                  cluster_config: Optional['outputs.ComputeCapacityReservationInstanceReservationConfigClusterConfig'] = None,
-                 cluster_placement_group_id: Optional[str] = None,
                  fault_domain: Optional[str] = None,
                  instance_shape_config: Optional['outputs.ComputeCapacityReservationInstanceReservationConfigInstanceShapeConfig'] = None,
                  used_count: Optional[str] = None):
@@ -3000,7 +2997,6 @@ class ComputeCapacityReservationInstanceReservationConfig(dict):
         :param str reserved_count: (Updatable) The total number of instances that can be launched from the capacity configuration.
         :param 'ComputeCapacityReservationInstanceReservationConfigClusterConfigArgs' cluster_config: (Updatable) The HPC cluster configuration requested when launching instances in a compute capacity reservation.
                
-               <<<<<<< HEAD
                If the parameter is provided, the reservation is created with the HPC island and a list of HPC blocks that you specify. If a list of HPC blocks are missing or not provided, the reservation is created with any HPC blocks in the HPC island that you specify. If the values of HPC island or HPC block that you provide are not valid, an error is returned.
         :param str fault_domain: (Updatable) The fault domain to use for instances created using this capacity configuration. For more information, see [Fault Domains](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/regions.htm#fault). If you do not specify the fault domain, the capacity is available for an instance that does not specify a fault domain. To change the fault domain for a reservation, delete the reservation and create a new one in the preferred fault domain.
                
@@ -3020,8 +3016,6 @@ class ComputeCapacityReservationInstanceReservationConfig(dict):
         pulumi.set(__self__, "reserved_count", reserved_count)
         if cluster_config is not None:
             pulumi.set(__self__, "cluster_config", cluster_config)
-        if cluster_placement_group_id is not None:
-            pulumi.set(__self__, "cluster_placement_group_id", cluster_placement_group_id)
         if fault_domain is not None:
             pulumi.set(__self__, "fault_domain", fault_domain)
         if instance_shape_config is not None:
@@ -3051,16 +3045,10 @@ class ComputeCapacityReservationInstanceReservationConfig(dict):
         """
         (Updatable) The HPC cluster configuration requested when launching instances in a compute capacity reservation.
 
-        <<<<<<< HEAD
         If the parameter is provided, the reservation is created with the HPC island and a list of HPC blocks that you specify. If a list of HPC blocks are missing or not provided, the reservation is created with any HPC blocks in the HPC island that you specify. If the values of HPC island or HPC block that you provide are not valid, an error is returned.
         """
         return pulumi.get(self, "cluster_config")
 
-    @property
-    @pulumi.getter(name="clusterPlacementGroupId")
-    def cluster_placement_group_id(self) -> Optional[str]:
-        return pulumi.get(self, "cluster_placement_group_id")
-
     @property
     @pulumi.getter(name="faultDomain")
     def fault_domain(self) -> Optional[str]:
@@ -5418,8 +5406,6 @@ class InstanceConfigurationInstanceDetailsBlockVolumeCreateDetails(dict):
             suggest = "backup_policy_id"
         elif key == "blockVolumeReplicas":
             suggest = "block_volume_replicas"
-        elif key == "clusterPlacementGroupId":
-            suggest = "cluster_placement_group_id"
         elif key == "compartmentId":
             suggest = "compartment_id"
         elif key == "definedTags":
@@ -5455,7 +5441,6 @@ class InstanceConfigurationInstanceDetailsBlockVolumeCreateDetails(dict):
                  availability_domain: Optional[str] = None,
                  backup_policy_id: Optional[str] = None,
                  block_volume_replicas: Optional['outputs.InstanceConfigurationInstanceDetailsBlockVolumeCreateDetailsBlockVolumeReplicas'] = None,
-                 cluster_placement_group_id: Optional[str] = None,
                  compartment_id: Optional[str] = None,
                  defined_tags: Optional[Mapping[str, Any]] = None,
                  display_name: Optional[str] = None,
@@ -5467,11 +5452,10 @@ class InstanceConfigurationInstanceDetailsBlockVolumeCreateDetails(dict):
                  vpus_per_gb: Optional[str] = None):
         """
         :param Sequence['InstanceConfigurationInstanceDetailsBlockVolumeCreateDetailsAutotunePolicyArgs'] autotune_policies: The list of autotune policies enabled for this volume.
-        :param str availability_domain: The availability domain of the instance.  Example: `Uocm:PHX-AD-1`
+        :param str availability_domain: The availability domain of the block volume replica.  Example: `Uocm:PHX-AD-1`
         :param str backup_policy_id: If provided, specifies the ID of the volume backup policy to assign to the newly created volume. If omitted, no policy will be assigned.
         :param 'InstanceConfigurationInstanceDetailsBlockVolumeCreateDetailsBlockVolumeReplicasArgs' block_volume_replicas: The list of block volume replicas to be enabled for this volume in the specified destination availability domains.
-        :param str cluster_placement_group_id: The clusterPlacementGroup Id of the volume for volume placement.
-        :param str compartment_id: (Updatable) The OCID of the compartment containing images to search
+        :param str compartment_id: The OCID of the compartment that contains the volume.
         :param Mapping[str, Any] defined_tags: Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Operations.CostCenter": "42"}`
         :param str display_name: A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information.
         :param Mapping[str, Any] freeform_tags: Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Department": "Finance"}`
@@ -5490,8 +5474,6 @@ class InstanceConfigurationInstanceDetailsBlockVolumeCreateDetails(dict):
             pulumi.set(__self__, "backup_policy_id", backup_policy_id)
         if block_volume_replicas is not None:
             pulumi.set(__self__, "block_volume_replicas", block_volume_replicas)
-        if cluster_placement_group_id is not None:
-            pulumi.set(__self__, "cluster_placement_group_id", cluster_placement_group_id)
         if compartment_id is not None:
             pulumi.set(__self__, "compartment_id", compartment_id)
         if defined_tags is not None:
@@ -5523,7 +5505,7 @@ class InstanceConfigurationInstanceDetailsBlockVolumeCreateDetails(dict):
     @pulumi.getter(name="availabilityDomain")
     def availability_domain(self) -> Optional[str]:
         """
-        The availability domain of the instance.  Example: `Uocm:PHX-AD-1`
+        The availability domain of the block volume replica.  Example: `Uocm:PHX-AD-1`
         """
         return pulumi.get(self, "availability_domain")
 
@@ -5543,19 +5525,11 @@ class InstanceConfigurationInstanceDetailsBlockVolumeCreateDetails(dict):
         """
         return pulumi.get(self, "block_volume_replicas")
 
-    @property
-    @pulumi.getter(name="clusterPlacementGroupId")
-    def cluster_placement_group_id(self) -> Optional[str]:
-        """
-        The clusterPlacementGroup Id of the volume for volume placement.
-        """
-        return pulumi.get(self, "cluster_placement_group_id")
-
     @property
     @pulumi.getter(name="compartmentId")
     def compartment_id(self) -> Optional[str]:
         """
-        (Updatable) The OCID of the compartment containing images to search
+        The OCID of the compartment that contains the volume.
         """
         return pulumi.get(self, "compartment_id")
 
@@ -5764,8 +5738,6 @@ class InstanceConfigurationInstanceDetailsLaunchDetails(dict):
             suggest = "availability_domain"
         elif key == "capacityReservationId":
             suggest = "capacity_reservation_id"
-        elif key == "clusterPlacementGroupId":
-            suggest = "cluster_placement_group_id"
         elif key == "compartmentId":
             suggest = "compartment_id"
         elif key == "createVnicDetails":
@@ -5819,7 +5791,6 @@ class InstanceConfigurationInstanceDetailsLaunchDetails(dict):
                  availability_config: Optional['outputs.InstanceConfigurationInstanceDetailsLaunchDetailsAvailabilityConfig'] = None,
                  availability_domain: Optional[str] = None,
                  capacity_reservation_id: Optional[str] = None,
-                 cluster_placement_group_id: Optional[str] = None,
                  compartment_id: Optional[str] = None,
                  create_vnic_details: Optional['outputs.InstanceConfigurationInstanceDetailsLaunchDetailsCreateVnicDetails'] = None,
                  dedicated_vm_host_id: Optional[str] = None,
@@ -5845,7 +5816,6 @@ class InstanceConfigurationInstanceDetailsLaunchDetails(dict):
         :param 'InstanceConfigurationInstanceDetailsLaunchDetailsAvailabilityConfigArgs' availability_config: Options for defining the availabiity of a VM instance after a maintenance event that impacts the underlying hardware.
         :param str availability_domain: The availability domain of the instance.  Example: `Uocm:PHX-AD-1`
         :param str capacity_reservation_id: The OCID of the compute capacity reservation this instance is launched under.
-        :param str cluster_placement_group_id: The clusterPlacementGroup Id of the volume for volume placement.
         :param str compartment_id: (Updatable) The OCID of the compartment containing images to search
         :param 'InstanceConfigurationInstanceDetailsLaunchDetailsCreateVnicDetailsArgs' create_vnic_details: Contains the properties of the VNIC for an instance configuration. See [CreateVnicDetails](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/CreateVnicDetails/) and [Instance Configurations](https://docs.cloud.oracle.com/iaas/Content/Compute/Concepts/instancemanagement.htm#config) for more information.
         :param str dedicated_vm_host_id: The OCID of the dedicated virtual machine host to place the instance on.
@@ -5930,8 +5900,6 @@ class InstanceConfigurationInstanceDetailsLaunchDetails(dict):
             pulumi.set(__self__, "availability_domain", availability_domain)
         if capacity_reservation_id is not None:
             pulumi.set(__self__, "capacity_reservation_id", capacity_reservation_id)
-        if cluster_placement_group_id is not None:
-            pulumi.set(__self__, "cluster_placement_group_id", cluster_placement_group_id)
         if compartment_id is not None:
             pulumi.set(__self__, "compartment_id", compartment_id)
         if create_vnic_details is not None:
@@ -6005,14 +5973,6 @@ class InstanceConfigurationInstanceDetailsLaunchDetails(dict):
         """
         return pulumi.get(self, "capacity_reservation_id")
 
-    @property
-    @pulumi.getter(name="clusterPlacementGroupId")
-    def cluster_placement_group_id(self) -> Optional[str]:
-        """
-        The clusterPlacementGroup Id of the volume for volume placement.
-        """
-        return pulumi.get(self, "cluster_placement_group_id")
-
     @property
     @pulumi.getter(name="compartmentId")
     def compartment_id(self) -> Optional[str]:
@@ -7642,8 +7602,6 @@ class InstanceConfigurationInstanceDetailsOptionBlockVolumeCreateDetails(dict):
             suggest = "backup_policy_id"
         elif key == "blockVolumeReplicas":
             suggest = "block_volume_replicas"
-        elif key == "clusterPlacementGroupId":
-            suggest = "cluster_placement_group_id"
         elif key == "compartmentId":
             suggest = "compartment_id"
         elif key == "definedTags":
@@ -7679,7 +7637,6 @@ class InstanceConfigurationInstanceDetailsOptionBlockVolumeCreateDetails(dict):
                  availability_domain: Optional[str] = None,
                  backup_policy_id: Optional[str] = None,
                  block_volume_replicas: Optional['outputs.InstanceConfigurationInstanceDetailsOptionBlockVolumeCreateDetailsBlockVolumeReplicas'] = None,
-                 cluster_placement_group_id: Optional[str] = None,
                  compartment_id: Optional[str] = None,
                  defined_tags: Optional[Mapping[str, Any]] = None,
                  display_name: Optional[str] = None,
@@ -7691,11 +7648,10 @@ class InstanceConfigurationInstanceDetailsOptionBlockVolumeCreateDetails(dict):
                  vpus_per_gb: Optional[str] = None):
         """
         :param Sequence['InstanceConfigurationInstanceDetailsOptionBlockVolumeCreateDetailsAutotunePolicyArgs'] autotune_policies: The list of autotune policies enabled for this volume.
-        :param str availability_domain: The availability domain of the instance.  Example: `Uocm:PHX-AD-1`
+        :param str availability_domain: The availability domain of the block volume replica.  Example: `Uocm:PHX-AD-1`
         :param str backup_policy_id: If provided, specifies the ID of the volume backup policy to assign to the newly created volume. If omitted, no policy will be assigned.
         :param 'InstanceConfigurationInstanceDetailsOptionBlockVolumeCreateDetailsBlockVolumeReplicasArgs' block_volume_replicas: The list of block volume replicas to be enabled for this volume in the specified destination availability domains.
-        :param str cluster_placement_group_id: The clusterPlacementGroup Id of the volume for volume placement.
-        :param str compartment_id: (Updatable) The OCID of the compartment containing images to search
+        :param str compartment_id: The OCID of the compartment that contains the volume.
         :param Mapping[str, Any] defined_tags: Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Operations.CostCenter": "42"}`
         :param str display_name: A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information.
         :param Mapping[str, Any] freeform_tags: Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Department": "Finance"}`
@@ -7714,8 +7670,6 @@ class InstanceConfigurationInstanceDetailsOptionBlockVolumeCreateDetails(dict):
             pulumi.set(__self__, "backup_policy_id", backup_policy_id)
         if block_volume_replicas is not None:
             pulumi.set(__self__, "block_volume_replicas", block_volume_replicas)
-        if cluster_placement_group_id is not None:
-            pulumi.set(__self__, "cluster_placement_group_id", cluster_placement_group_id)
         if compartment_id is not None:
             pulumi.set(__self__, "compartment_id", compartment_id)
         if defined_tags is not None:
@@ -7747,7 +7701,7 @@ class InstanceConfigurationInstanceDetailsOptionBlockVolumeCreateDetails(dict):
     @pulumi.getter(name="availabilityDomain")
     def availability_domain(self) -> Optional[str]:
         """
-        The availability domain of the instance.  Example: `Uocm:PHX-AD-1`
+        The availability domain of the block volume replica.  Example: `Uocm:PHX-AD-1`
         """
         return pulumi.get(self, "availability_domain")
 
@@ -7767,19 +7721,11 @@ class InstanceConfigurationInstanceDetailsOptionBlockVolumeCreateDetails(dict):
         """
         return pulumi.get(self, "block_volume_replicas")
 
-    @property
-    @pulumi.getter(name="clusterPlacementGroupId")
-    def cluster_placement_group_id(self) -> Optional[str]:
-        """
-        The clusterPlacementGroup Id of the volume for volume placement.
-        """
-        return pulumi.get(self, "cluster_placement_group_id")
-
     @property
     @pulumi.getter(name="compartmentId")
     def compartment_id(self) -> Optional[str]:
         """
-        (Updatable) The OCID of the compartment containing images to search
+        The OCID of the compartment that contains the volume.
         """
         return pulumi.get(self, "compartment_id")
 
@@ -7988,8 +7934,6 @@ class InstanceConfigurationInstanceDetailsOptionLaunchDetails(dict):
             suggest = "availability_domain"
         elif key == "capacityReservationId":
             suggest = "capacity_reservation_id"
-        elif key == "clusterPlacementGroupId":
-            suggest = "cluster_placement_group_id"
         elif key == "compartmentId":
             suggest = "compartment_id"
         elif key == "createVnicDetails":
@@ -8043,7 +7987,6 @@ class InstanceConfigurationInstanceDetailsOptionLaunchDetails(dict):
                  availability_config: Optional['outputs.InstanceConfigurationInstanceDetailsOptionLaunchDetailsAvailabilityConfig'] = None,
                  availability_domain: Optional[str] = None,
                  capacity_reservation_id: Optional[str] = None,
-                 cluster_placement_group_id: Optional[str] = None,
                  compartment_id: Optional[str] = None,
                  create_vnic_details: Optional['outputs.InstanceConfigurationInstanceDetailsOptionLaunchDetailsCreateVnicDetails'] = None,
                  dedicated_vm_host_id: Optional[str] = None,
@@ -8069,7 +8012,6 @@ class InstanceConfigurationInstanceDetailsOptionLaunchDetails(dict):
         :param 'InstanceConfigurationInstanceDetailsOptionLaunchDetailsAvailabilityConfigArgs' availability_config: Options for defining the availabiity of a VM instance after a maintenance event that impacts the underlying hardware.
         :param str availability_domain: The availability domain of the instance.  Example: `Uocm:PHX-AD-1`
         :param str capacity_reservation_id: The OCID of the compute capacity reservation this instance is launched under.
-        :param str cluster_placement_group_id: The clusterPlacementGroup Id of the volume for volume placement.
         :param str compartment_id: (Updatable) The OCID of the compartment containing images to search
         :param 'InstanceConfigurationInstanceDetailsOptionLaunchDetailsCreateVnicDetailsArgs' create_vnic_details: Contains the properties of the VNIC for an instance configuration. See [CreateVnicDetails](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/CreateVnicDetails/) and [Instance Configurations](https://docs.cloud.oracle.com/iaas/Content/Compute/Concepts/instancemanagement.htm#config) for more information.
         :param str dedicated_vm_host_id: The OCID of the dedicated virtual machine host to place the instance on.
@@ -8154,8 +8096,6 @@ class InstanceConfigurationInstanceDetailsOptionLaunchDetails(dict):
             pulumi.set(__self__, "availability_domain", availability_domain)
         if capacity_reservation_id is not None:
             pulumi.set(__self__, "capacity_reservation_id", capacity_reservation_id)
-        if cluster_placement_group_id is not None:
-            pulumi.set(__self__, "cluster_placement_group_id", cluster_placement_group_id)
         if compartment_id is not None:
             pulumi.set(__self__, "compartment_id", compartment_id)
         if create_vnic_details is not None:
@@ -8229,14 +8169,6 @@ class InstanceConfigurationInstanceDetailsOptionLaunchDetails(dict):
         """
         return pulumi.get(self, "capacity_reservation_id")
 
-    @property
-    @pulumi.getter(name="clusterPlacementGroupId")
-    def cluster_placement_group_id(self) -> Optional[str]:
-        """
-        The clusterPlacementGroup Id of the volume for volume placement.
-        """
-        return pulumi.get(self, "cluster_placement_group_id")
-
     @property
     @pulumi.getter(name="compartmentId")
     def compartment_id(self) -> Optional[str]:
@@ -10274,7 +10206,7 @@ class InstanceCreateVnicDetails(dict):
         :param Sequence[str] nsg_ids: (Updatable) A list of the OCIDs of the network security groups (NSGs) to add the VNIC to. For more information about NSGs, see [NetworkSecurityGroup](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/NetworkSecurityGroup/).
                
                If a `vlanId` is specified, the `nsgIds` cannot be specified. The `vlanId` indicates that the VNIC will belong to a VLAN instead of a subnet. With VLANs, all VNICs in the VLAN belong to the NSGs that are associated with the VLAN. See [Vlan](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/Vlan).
-        :param str private_ip: A private IP address of your choice to assign to the VNIC. Must be an available IP address within the subnet's CIDR. If you don't specify a value, Oracle automatically assigns a private IP address from the subnet. This is the VNIC's *primary* private IP address. The value appears in the `[Vnic](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/Vnic/)` object and also the `[PrivateIp](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/)` object returned by `[ListPrivateIps](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/ListPrivateIps)` and `[GetPrivateIp](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/GetPrivateIp)`.
+        :param str private_ip: A private IP address of your choice to assign to the VNIC. Must be an available IP address within the subnet's CIDR. If you don't specify a value, Oracle automatically assigns a private IP address from the subnet. This is the VNIC's *primary* private IP address. The value appears in the [Vnic](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/Vnic/) object and also the [PrivateIp](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/) object returned by [ListPrivateIps](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/ListPrivateIps) and [GetPrivateIp](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/GetPrivateIp).
                
                If you specify a `vlanId`, the `privateIp` cannot be specified. See [Vlan](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/Vlan).
                
@@ -10403,7 +10335,7 @@ class InstanceCreateVnicDetails(dict):
     @pulumi.getter(name="privateIp")
     def private_ip(self) -> Optional[str]:
         """
-        A private IP address of your choice to assign to the VNIC. Must be an available IP address within the subnet's CIDR. If you don't specify a value, Oracle automatically assigns a private IP address from the subnet. This is the VNIC's *primary* private IP address. The value appears in the `[Vnic](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/Vnic/)` object and also the `[PrivateIp](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/)` object returned by `[ListPrivateIps](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/ListPrivateIps)` and `[GetPrivateIp](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/GetPrivateIp)`.
+        A private IP address of your choice to assign to the VNIC. Must be an available IP address within the subnet's CIDR. If you don't specify a value, Oracle automatically assigns a private IP address from the subnet. This is the VNIC's *primary* private IP address. The value appears in the [Vnic](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/Vnic/) object and also the [PrivateIp](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/) object returned by [ListPrivateIps](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/ListPrivateIps) and [GetPrivateIp](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/GetPrivateIp).
 
         If you specify a `vlanId`, the `privateIp` cannot be specified. See [Vlan](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/Vlan).
 
@@ -10818,7 +10750,7 @@ class InstanceLaunchVolumeAttachmentLaunchCreateVolumeDetails(dict):
         :param str volume_creation_type: Specifies the method for volume creation.
         :param str compartment_id: (Updatable) The OCID of the compartment containing images to search
         :param str display_name: A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information.
-        :param str kms_key_id: (Updatable) The OCID of the Vault service key to assign as the master encryption key for the boot volume.
+        :param str kms_key_id: The OCID of the Vault service key to assign as the master encryption key for the boot volume.
         :param str vpus_per_gb: The number of volume performance units (VPUs) that will be applied to this volume per GB, representing the Block Volume service's elastic performance options. See [Block Volume Performance Levels](https://docs.cloud.oracle.com/iaas/Content/Block/Concepts/blockvolumeperformance.htm#perf_levels) for more information.
                
                Allowed values:
@@ -10870,7 +10802,7 @@ class InstanceLaunchVolumeAttachmentLaunchCreateVolumeDetails(dict):
     @pulumi.getter(name="kmsKeyId")
     def kms_key_id(self) -> Optional[str]:
         """
-        (Updatable) The OCID of the Vault service key to assign as the master encryption key for the boot volume.
+        The OCID of the Vault service key to assign as the master encryption key for the boot volume.
         """
         return pulumi.get(self, "kms_key_id")
 
@@ -11331,8 +11263,8 @@ class InstancePoolPlacementConfiguration(dict):
                
                To get a list of fault domains, use the [ListFaultDomains](https://docs.cloud.oracle.com/iaas/api/#/en/identity/20160918/FaultDomain/ListFaultDomains) operation in the Identity and Access Management Service API.
                
-               <<<<<<< HEAD
                Example: `[FAULT-DOMAIN-1, FAULT-DOMAIN-2, FAULT-DOMAIN-3]`
+        :param str primary_subnet_id: (Updatable) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the primary subnet to place instances. This field is deprecated. Use `primaryVnicSubnets` instead to set VNIC data for instances in the pool.
         :param 'InstancePoolPlacementConfigurationPrimaryVnicSubnetsArgs' primary_vnic_subnets: (Updatable) Details about the IPv6 primary subnet.
         :param Sequence['InstancePoolPlacementConfigurationSecondaryVnicSubnetArgs'] secondary_vnic_subnets: (Updatable) The set of secondary VNIC data for instances in the pool.
         """
@@ -11366,7 +11298,6 @@ class InstancePoolPlacementConfiguration(dict):
 
         To get a list of fault domains, use the [ListFaultDomains](https://docs.cloud.oracle.com/iaas/api/#/en/identity/20160918/FaultDomain/ListFaultDomains) operation in the Identity and Access Management Service API.
 
-        <<<<<<< HEAD
         Example: `[FAULT-DOMAIN-1, FAULT-DOMAIN-2, FAULT-DOMAIN-3]`
         """
         return pulumi.get(self, "fault_domains")
@@ -11374,6 +11305,9 @@ class InstancePoolPlacementConfiguration(dict):
     @property
     @pulumi.getter(name="primarySubnetId")
     def primary_subnet_id(self) -> Optional[str]:
+        """
+        (Updatable) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the primary subnet to place instances. This field is deprecated. Use `primaryVnicSubnets` instead to set VNIC data for instances in the pool.
+        """
         return pulumi.get(self, "primary_subnet_id")
 
     @property
@@ -11900,8 +11834,6 @@ class InstanceSourceDetails(dict):
             suggest = "boot_volume_vpus_per_gb"
         elif key == "instanceSourceImageFilterDetails":
             suggest = "instance_source_image_filter_details"
-        elif key == "isPreserveBootVolumeEnabled":
-            suggest = "is_preserve_boot_volume_enabled"
         elif key == "kmsKeyId":
             suggest = "kms_key_id"
         elif key == "sourceId":
@@ -11923,18 +11855,17 @@ class InstanceSourceDetails(dict):
                  boot_volume_size_in_gbs: Optional[str] = None,
                  boot_volume_vpus_per_gb: Optional[str] = None,
                  instance_source_image_filter_details: Optional['outputs.InstanceSourceDetailsInstanceSourceImageFilterDetails'] = None,
-                 is_preserve_boot_volume_enabled: Optional[bool] = None,
                  kms_key_id: Optional[str] = None,
                  source_id: Optional[str] = None):
         """
-        :param str source_type: (Updatable) The source type for the instance. Use `image` when specifying the image OCID. Use `bootVolume` when specifying the boot volume OCID.
+        :param str source_type: The source type for the instance. Use `image` when specifying the image OCID. Use `bootVolume` when specifying the boot volume OCID.
         :param str boot_volume_size_in_gbs: (Updatable) The size of the boot volume in GBs. Minimum value is 50 GB and maximum value is 32,768 GB (32 TB).
         :param str boot_volume_vpus_per_gb: The number of volume performance units (VPUs) that will be applied to this volume per GB, representing the Block Volume service's elastic performance options. See [Block Volume Performance Levels](https://docs.cloud.oracle.com/iaas/Content/Block/Concepts/blockvolumeperformance.htm#perf_levels) for more information.
                
                Allowed values:
         :param 'InstanceSourceDetailsInstanceSourceImageFilterDetailsArgs' instance_source_image_filter_details: These are the criteria for selecting an image. This is required if imageId is not specified.
-        :param str kms_key_id: (Updatable) The OCID of the Vault service key to assign as the master encryption key for the boot volume.
-        :param str source_id: (Updatable) The OCID of the boot volume used to boot the instance.
+        :param str kms_key_id: The OCID of the Vault service key to assign as the master encryption key for the boot volume.
+        :param str source_id: The OCID of an image or a boot volume to use, depending on the value of `source_type`.
         """
         pulumi.set(__self__, "source_type", source_type)
         if boot_volume_size_in_gbs is not None:
@@ -11943,8 +11874,6 @@ class InstanceSourceDetails(dict):
             pulumi.set(__self__, "boot_volume_vpus_per_gb", boot_volume_vpus_per_gb)
         if instance_source_image_filter_details is not None:
             pulumi.set(__self__, "instance_source_image_filter_details", instance_source_image_filter_details)
-        if is_preserve_boot_volume_enabled is not None:
-            pulumi.set(__self__, "is_preserve_boot_volume_enabled", is_preserve_boot_volume_enabled)
         if kms_key_id is not None:
             pulumi.set(__self__, "kms_key_id", kms_key_id)
         if source_id is not None:
@@ -11954,7 +11883,7 @@ class InstanceSourceDetails(dict):
     @pulumi.getter(name="sourceType")
     def source_type(self) -> str:
         """
-        (Updatable) The source type for the instance. Use `image` when specifying the image OCID. Use `bootVolume` when specifying the boot volume OCID.
+        The source type for the instance. Use `image` when specifying the image OCID. Use `bootVolume` when specifying the boot volume OCID.
         """
         return pulumi.get(self, "source_type")
 
@@ -11984,16 +11913,11 @@ class InstanceSourceDetails(dict):
         """
         return pulumi.get(self, "instance_source_image_filter_details")
 
-    @property
-    @pulumi.getter(name="isPreserveBootVolumeEnabled")
-    def is_preserve_boot_volume_enabled(self) -> Optional[bool]:
-        return pulumi.get(self, "is_preserve_boot_volume_enabled")
-
     @property
     @pulumi.getter(name="kmsKeyId")
     def kms_key_id(self) -> Optional[str]:
         """
-        (Updatable) The OCID of the Vault service key to assign as the master encryption key for the boot volume.
+        The OCID of the Vault service key to assign as the master encryption key for the boot volume.
         """
         return pulumi.get(self, "kms_key_id")
 
@@ -12001,7 +11925,7 @@ class InstanceSourceDetails(dict):
     @pulumi.getter(name="sourceId")
     def source_id(self) -> Optional[str]:
         """
-        (Updatable) The OCID of the boot volume used to boot the instance.
+        The OCID of an image or a boot volume to use, depending on the value of `source_type`.
         """
         return pulumi.get(self, "source_id")
 
@@ -14274,11 +14198,11 @@ class VnicAttachmentCreateVnicDetails(dict):
         :param Mapping[str, Any] defined_tags: (Updatable) Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Operations.CostCenter": "42"}`
         :param str display_name: A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information.
         :param Mapping[str, Any] freeform_tags: (Updatable) Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Department": "Finance"}`
-        :param str hostname_label: (Updatable) The hostname for the VNIC's primary private IP. Used for DNS. The value is the hostname portion of the primary private IP's fully qualified domain name (FQDN) (for example, `bminstance1` in FQDN `bminstance1.subnet123.vcn1.oraclevcn.com`). Must be unique across all VNICs in the subnet and comply with [RFC 952](https://tools.ietf.org/html/rfc952) and [RFC 1123](https://tools.ietf.org/html/rfc1123). The value appears in the `[Vnic](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/Vnic/)` object and also the `[PrivateIp](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/)` object returned by `[ListPrivateIps](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/ListPrivateIps)` and `[GetPrivateIp](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/GetPrivateIp)`.
+        :param str hostname_label: (Updatable) The hostname for the VNIC's primary private IP. Used for DNS. The value is the hostname portion of the primary private IP's fully qualified domain name (FQDN) (for example, `bminstance1` in FQDN `bminstance1.subnet123.vcn1.oraclevcn.com`). Must be unique across all VNICs in the subnet and comply with [RFC 952](https://tools.ietf.org/html/rfc952) and [RFC 1123](https://tools.ietf.org/html/rfc1123). The value appears in the [Vnic](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/Vnic/) object and also the [PrivateIp](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/) object returned by [ListPrivateIps](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/ListPrivateIps) and [GetPrivateIp](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/GetPrivateIp).
                
                For more information, see [DNS in Your Virtual Cloud Network](https://docs.cloud.oracle.com/iaas/Content/Network/Concepts/dns.htm).
                
-               When launching an instance, use this `hostnameLabel` instead of the deprecated `hostnameLabel` in `[LaunchInstanceDetails](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/requests/LaunchInstanceDetails)`. If you provide both, the values must match.
+               When launching an instance, use this `hostnameLabel` instead of the deprecated `hostnameLabel` in [LaunchInstanceDetails](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/requests/LaunchInstanceDetails). If you provide both, the values must match.
                
                Example: `bminstance1`
                
@@ -14287,7 +14211,7 @@ class VnicAttachmentCreateVnicDetails(dict):
         :param Sequence[str] nsg_ids: (Updatable) A list of the OCIDs of the network security groups (NSGs) to add the VNIC to. For more information about NSGs, see [NetworkSecurityGroup](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/NetworkSecurityGroup/).
                
                If a `vlanId` is specified, the `nsgIds` cannot be specified. The `vlanId` indicates that the VNIC will belong to a VLAN instead of a subnet. With VLANs, all VNICs in the VLAN belong to the NSGs that are associated with the VLAN. See [Vlan](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/Vlan).
-        :param str private_ip: A private IP address of your choice to assign to the VNIC. Must be an available IP address within the subnet's CIDR. If you don't specify a value, Oracle automatically assigns a private IP address from the subnet. This is the VNIC's *primary* private IP address. The value appears in the `[Vnic](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/Vnic/)` object and also the `[PrivateIp](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/)` object returned by `[ListPrivateIps](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/ListPrivateIps)` and `[GetPrivateIp](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/GetPrivateIp)`.
+        :param str private_ip: A private IP address of your choice to assign to the VNIC. Must be an available IP address within the subnet's CIDR. If you don't specify a value, Oracle automatically assigns a private IP address from the subnet. This is the VNIC's *primary* private IP address. The value appears in the [Vnic](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/Vnic/) object and also the [PrivateIp](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/) object returned by [ListPrivateIps](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/ListPrivateIps) and [GetPrivateIp](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/GetPrivateIp).
                
                If you specify a `vlanId`, the `privateIp` cannot be specified. See [Vlan](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/Vlan).
                
@@ -14393,11 +14317,11 @@ class VnicAttachmentCreateVnicDetails(dict):
     @pulumi.getter(name="hostnameLabel")
     def hostname_label(self) -> Optional[str]:
         """
-        (Updatable) The hostname for the VNIC's primary private IP. Used for DNS. The value is the hostname portion of the primary private IP's fully qualified domain name (FQDN) (for example, `bminstance1` in FQDN `bminstance1.subnet123.vcn1.oraclevcn.com`). Must be unique across all VNICs in the subnet and comply with [RFC 952](https://tools.ietf.org/html/rfc952) and [RFC 1123](https://tools.ietf.org/html/rfc1123). The value appears in the `[Vnic](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/Vnic/)` object and also the `[PrivateIp](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/)` object returned by `[ListPrivateIps](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/ListPrivateIps)` and `[GetPrivateIp](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/GetPrivateIp)`.
+        (Updatable) The hostname for the VNIC's primary private IP. Used for DNS. The value is the hostname portion of the primary private IP's fully qualified domain name (FQDN) (for example, `bminstance1` in FQDN `bminstance1.subnet123.vcn1.oraclevcn.com`). Must be unique across all VNICs in the subnet and comply with [RFC 952](https://tools.ietf.org/html/rfc952) and [RFC 1123](https://tools.ietf.org/html/rfc1123). The value appears in the [Vnic](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/Vnic/) object and also the [PrivateIp](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/) object returned by [ListPrivateIps](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/ListPrivateIps) and [GetPrivateIp](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/GetPrivateIp).
 
         For more information, see [DNS in Your Virtual Cloud Network](https://docs.cloud.oracle.com/iaas/Content/Network/Concepts/dns.htm).
 
-        When launching an instance, use this `hostnameLabel` instead of the deprecated `hostnameLabel` in `[LaunchInstanceDetails](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/requests/LaunchInstanceDetails)`. If you provide both, the values must match.
+        When launching an instance, use this `hostnameLabel` instead of the deprecated `hostnameLabel` in [LaunchInstanceDetails](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/requests/LaunchInstanceDetails). If you provide both, the values must match.
 
         Example: `bminstance1`
 
@@ -14427,7 +14351,7 @@ class VnicAttachmentCreateVnicDetails(dict):
     @pulumi.getter(name="privateIp")
     def private_ip(self) -> Optional[str]:
         """
-        A private IP address of your choice to assign to the VNIC. Must be an available IP address within the subnet's CIDR. If you don't specify a value, Oracle automatically assigns a private IP address from the subnet. This is the VNIC's *primary* private IP address. The value appears in the `[Vnic](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/Vnic/)` object and also the `[PrivateIp](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/)` object returned by `[ListPrivateIps](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/ListPrivateIps)` and `[GetPrivateIp](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/GetPrivateIp)`.
+        A private IP address of your choice to assign to the VNIC. Must be an available IP address within the subnet's CIDR. If you don't specify a value, Oracle automatically assigns a private IP address from the subnet. This is the VNIC's *primary* private IP address. The value appears in the [Vnic](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/Vnic/) object and also the [PrivateIp](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/) object returned by [ListPrivateIps](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/ListPrivateIps) and [GetPrivateIp](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/PrivateIp/GetPrivateIp).
 
         If you specify a `vlanId`, the `privateIp` cannot be specified. See [Vlan](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/Vlan).
 
@@ -15746,8 +15670,7 @@ class GetBootVolumeAttachmentsBootVolumeAttachmentResult(dict):
                  instance_id: str,
                  is_pv_encryption_in_transit_enabled: bool,
                  state: str,
-                 time_created: str,
-                 time_updated: str):
+                 time_created: str):
         """
         :param str availability_domain: The name of the availability domain.  Example: `Uocm:PHX-AD-1`
         :param str boot_volume_id: The OCID of the boot volume.
@@ -15759,7 +15682,6 @@ class GetBootVolumeAttachmentsBootVolumeAttachmentResult(dict):
         :param bool is_pv_encryption_in_transit_enabled: Whether in-transit encryption for the boot volume's paravirtualized attachment is enabled or not.
         :param str state: The current state of the boot volume attachment.
         :param str time_created: The date and time the boot volume was created, in the format defined by [RFC3339](https://tools.ietf.org/html/rfc3339).  Example: `2016-08-25T21:10:29.600Z`
-        :param str time_updated: The date and time the boot volume attachment was updated, in the format defined by [RFC3339](https://tools.ietf.org/html/rfc3339).  Example: `2016-08-25T21:10:29.600Z`
         """
         pulumi.set(__self__, "availability_domain", availability_domain)
         pulumi.set(__self__, "boot_volume_id", boot_volume_id)
@@ -15771,7 +15693,6 @@ class GetBootVolumeAttachmentsBootVolumeAttachmentResult(dict):
         pulumi.set(__self__, "is_pv_encryption_in_transit_enabled", is_pv_encryption_in_transit_enabled)
         pulumi.set(__self__, "state", state)
         pulumi.set(__self__, "time_created", time_created)
-        pulumi.set(__self__, "time_updated", time_updated)
 
     @property
     @pulumi.getter(name="availabilityDomain")
@@ -15853,14 +15774,6 @@ class GetBootVolumeAttachmentsBootVolumeAttachmentResult(dict):
         """
         return pulumi.get(self, "time_created")
 
-    @property
-    @pulumi.getter(name="timeUpdated")
-    def time_updated(self) -> str:
-        """
-        The date and time the boot volume attachment was updated, in the format defined by [RFC3339](https://tools.ietf.org/html/rfc3339).  Example: `2016-08-25T21:10:29.600Z`
-        """
-        return pulumi.get(self, "time_updated")
-
 
 @pulumi.output_type
 class GetBootVolumeAttachmentsFilterResult(dict):
@@ -16480,7 +16393,6 @@ class GetBootVolumesBootVolumeResult(dict):
                  backup_policy_id: str,
                  boot_volume_replicas: Sequence['outputs.GetBootVolumesBootVolumeBootVolumeReplicaResult'],
                  boot_volume_replicas_deletion: bool,
-                 cluster_placement_group_id: str,
                  compartment_id: str,
                  defined_tags: Mapping[str, Any],
                  display_name: str,
@@ -16503,7 +16415,6 @@ class GetBootVolumesBootVolumeResult(dict):
         :param Sequence['GetBootVolumesBootVolumeAutotunePolicyArgs'] autotune_policies: The list of autotune policies enabled for this volume.
         :param str availability_domain: The name of the availability domain.  Example: `Uocm:PHX-AD-1`
         :param Sequence['GetBootVolumesBootVolumeBootVolumeReplicaArgs'] boot_volume_replicas: The list of boot volume replicas of this boot volume
-        :param str cluster_placement_group_id: The clusterPlacementGroup Id of the volume for volume placement.
         :param str compartment_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment.
         :param Mapping[str, Any] defined_tags: Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Operations.CostCenter": "42"}`
         :param str display_name: A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information.
@@ -16527,7 +16438,6 @@ class GetBootVolumesBootVolumeResult(dict):
         pulumi.set(__self__, "backup_policy_id", backup_policy_id)
         pulumi.set(__self__, "boot_volume_replicas", boot_volume_replicas)
         pulumi.set(__self__, "boot_volume_replicas_deletion", boot_volume_replicas_deletion)
-        pulumi.set(__self__, "cluster_placement_group_id", cluster_placement_group_id)
         pulumi.set(__self__, "compartment_id", compartment_id)
         pulumi.set(__self__, "defined_tags", defined_tags)
         pulumi.set(__self__, "display_name", display_name)
@@ -16591,14 +16501,6 @@ class GetBootVolumesBootVolumeResult(dict):
     def boot_volume_replicas_deletion(self) -> bool:
         return pulumi.get(self, "boot_volume_replicas_deletion")
 
-    @property
-    @pulumi.getter(name="clusterPlacementGroupId")
-    def cluster_placement_group_id(self) -> str:
-        """
-        The clusterPlacementGroup Id of the volume for volume placement.
-        """
-        return pulumi.get(self, "cluster_placement_group_id")
-
     @property
     @pulumi.getter(name="compartmentId")
     def compartment_id(self) -> str:
@@ -20261,7 +20163,6 @@ class GetClusterNetworksFilterResult(dict):
 class GetComputeCapacityReservationInstanceReservationConfigResult(dict):
     def __init__(__self__, *,
                  cluster_configs: Sequence['outputs.GetComputeCapacityReservationInstanceReservationConfigClusterConfigResult'],
-                 cluster_placement_group_id: str,
                  fault_domain: str,
                  instance_shape: str,
                  instance_shape_configs: Sequence['outputs.GetComputeCapacityReservationInstanceReservationConfigInstanceShapeConfigResult'],
@@ -20276,7 +20177,6 @@ class GetComputeCapacityReservationInstanceReservationConfigResult(dict):
         :param str used_count: The amount of capacity in use out of the total capacity reserved in this capacity configuration.
         """
         pulumi.set(__self__, "cluster_configs", cluster_configs)
-        pulumi.set(__self__, "cluster_placement_group_id", cluster_placement_group_id)
         pulumi.set(__self__, "fault_domain", fault_domain)
         pulumi.set(__self__, "instance_shape", instance_shape)
         pulumi.set(__self__, "instance_shape_configs", instance_shape_configs)
@@ -20291,11 +20191,6 @@ class GetComputeCapacityReservationInstanceReservationConfigResult(dict):
         """
         return pulumi.get(self, "cluster_configs")
 
-    @property
-    @pulumi.getter(name="clusterPlacementGroupId")
-    def cluster_placement_group_id(self) -> str:
-        return pulumi.get(self, "cluster_placement_group_id")
-
     @property
     @pulumi.getter(name="faultDomain")
     def fault_domain(self) -> str:
@@ -20343,8 +20238,8 @@ class GetComputeCapacityReservationInstanceReservationConfigClusterConfigResult(
                  hpc_island_id: str,
                  network_block_ids: Sequence[str]):
         """
-        :param str hpc_island_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the HPC island.
-        :param Sequence[str] network_block_ids: The list of OCIDs of the network blocks.
+        :param str hpc_island_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the HpcIsland.
+        :param Sequence[str] network_block_ids: The list of OCID of the network blocks.
         """
         pulumi.set(__self__, "hpc_island_id", hpc_island_id)
         pulumi.set(__self__, "network_block_ids", network_block_ids)
@@ -20353,7 +20248,7 @@ class GetComputeCapacityReservationInstanceReservationConfigClusterConfigResult(
     @pulumi.getter(name="hpcIslandId")
     def hpc_island_id(self) -> str:
         """
-        The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the HPC island.
+        The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the HpcIsland.
         """
         return pulumi.get(self, "hpc_island_id")
 
@@ -20361,7 +20256,7 @@ class GetComputeCapacityReservationInstanceReservationConfigClusterConfigResult(
     @pulumi.getter(name="networkBlockIds")
     def network_block_ids(self) -> Sequence[str]:
         """
-        The list of OCIDs of the network blocks.
+        The list of OCID of the network blocks.
         """
         return pulumi.get(self, "network_block_ids")
 
@@ -20455,7 +20350,6 @@ class GetComputeCapacityReservationInstanceShapesFilterResult(dict):
 class GetComputeCapacityReservationInstancesCapacityReservationInstanceResult(dict):
     def __init__(__self__, *,
                  availability_domain: str,
-                 cluster_placement_group_id: str,
                  compartment_id: str,
                  fault_domain: str,
                  id: str,
@@ -20463,7 +20357,6 @@ class GetComputeCapacityReservationInstancesCapacityReservationInstanceResult(di
                  shape_configs: Sequence['outputs.GetComputeCapacityReservationInstancesCapacityReservationInstanceShapeConfigResult']):
         """
         :param str availability_domain: The name of the availability domain.  Example: `Uocm:PHX-AD-1`
-        :param str cluster_placement_group_id: The OCID of the cluster placement group of the instance.
         :param str compartment_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment.
         :param str fault_domain: The fault domain the instance is running in.
         :param str id: The OCID of the instance.
@@ -20471,7 +20364,6 @@ class GetComputeCapacityReservationInstancesCapacityReservationInstanceResult(di
         :param Sequence['GetComputeCapacityReservationInstancesCapacityReservationInstanceShapeConfigArgs'] shape_configs: The shape configuration requested when launching instances in a compute capacity reservation.
         """
         pulumi.set(__self__, "availability_domain", availability_domain)
-        pulumi.set(__self__, "cluster_placement_group_id", cluster_placement_group_id)
         pulumi.set(__self__, "compartment_id", compartment_id)
         pulumi.set(__self__, "fault_domain", fault_domain)
         pulumi.set(__self__, "id", id)
@@ -20486,14 +20378,6 @@ class GetComputeCapacityReservationInstancesCapacityReservationInstanceResult(di
         """
         return pulumi.get(self, "availability_domain")
 
-    @property
-    @pulumi.getter(name="clusterPlacementGroupId")
-    def cluster_placement_group_id(self) -> str:
-        """
-        The OCID of the cluster placement group of the instance.
-        """
-        return pulumi.get(self, "cluster_placement_group_id")
-
     @property
     @pulumi.getter(name="compartmentId")
     def compartment_id(self) -> str:
@@ -20745,7 +20629,6 @@ class GetComputeCapacityReservationsComputeCapacityReservationResult(dict):
 class GetComputeCapacityReservationsComputeCapacityReservationInstanceReservationConfigResult(dict):
     def __init__(__self__, *,
                  cluster_configs: Sequence['outputs.GetComputeCapacityReservationsComputeCapacityReservationInstanceReservationConfigClusterConfigResult'],
-                 cluster_placement_group_id: str,
                  fault_domain: str,
                  instance_shape: str,
                  instance_shape_configs: Sequence['outputs.GetComputeCapacityReservationsComputeCapacityReservationInstanceReservationConfigInstanceShapeConfigResult'],
@@ -20760,7 +20643,6 @@ class GetComputeCapacityReservationsComputeCapacityReservationInstanceReservatio
         :param str used_count: The amount of capacity in use out of the total capacity reserved in this capacity configuration.
         """
         pulumi.set(__self__, "cluster_configs", cluster_configs)
-        pulumi.set(__self__, "cluster_placement_group_id", cluster_placement_group_id)
         pulumi.set(__self__, "fault_domain", fault_domain)
         pulumi.set(__self__, "instance_shape", instance_shape)
         pulumi.set(__self__, "instance_shape_configs", instance_shape_configs)
@@ -20775,11 +20657,6 @@ class GetComputeCapacityReservationsComputeCapacityReservationInstanceReservatio
         """
         return pulumi.get(self, "cluster_configs")
 
-    @property
-    @pulumi.getter(name="clusterPlacementGroupId")
-    def cluster_placement_group_id(self) -> str:
-        return pulumi.get(self, "cluster_placement_group_id")
-
     @property
     @pulumi.getter(name="faultDomain")
     def fault_domain(self) -> str:
@@ -20827,8 +20704,8 @@ class GetComputeCapacityReservationsComputeCapacityReservationInstanceReservatio
                  hpc_island_id: str,
                  network_block_ids: Sequence[str]):
         """
-        :param str hpc_island_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the HPC island.
-        :param Sequence[str] network_block_ids: The list of OCIDs of the network blocks.
+        :param str hpc_island_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the HpcIsland.
+        :param Sequence[str] network_block_ids: The list of OCID of the network blocks.
         """
         pulumi.set(__self__, "hpc_island_id", hpc_island_id)
         pulumi.set(__self__, "network_block_ids", network_block_ids)
@@ -20837,7 +20714,7 @@ class GetComputeCapacityReservationsComputeCapacityReservationInstanceReservatio
     @pulumi.getter(name="hpcIslandId")
     def hpc_island_id(self) -> str:
         """
-        The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the HPC island.
+        The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the HpcIsland.
         """
         return pulumi.get(self, "hpc_island_id")
 
@@ -20845,7 +20722,7 @@ class GetComputeCapacityReservationsComputeCapacityReservationInstanceReservatio
     @pulumi.getter(name="networkBlockIds")
     def network_block_ids(self) -> Sequence[str]:
         """
-        The list of OCIDs of the network blocks.
+        The list of OCID of the network blocks.
         """
         return pulumi.get(self, "network_block_ids")
 
@@ -26221,7 +26098,6 @@ class GetInstanceConfigurationInstanceDetailBlockVolumeCreateDetailResult(dict):
                  availability_domain: str,
                  backup_policy_id: str,
                  block_volume_replicas: Sequence['outputs.GetInstanceConfigurationInstanceDetailBlockVolumeCreateDetailBlockVolumeReplicaResult'],
-                 cluster_placement_group_id: str,
                  compartment_id: str,
                  defined_tags: Mapping[str, Any],
                  display_name: str,
@@ -26236,7 +26112,6 @@ class GetInstanceConfigurationInstanceDetailBlockVolumeCreateDetailResult(dict):
         :param str availability_domain: The availability domain of the instance.  Example: `Uocm:PHX-AD-1`
         :param str backup_policy_id: If provided, specifies the ID of the volume backup policy to assign to the newly created volume. If omitted, no policy will be assigned.
         :param Sequence['GetInstanceConfigurationInstanceDetailBlockVolumeCreateDetailBlockVolumeReplicaArgs'] block_volume_replicas: The list of block volume replicas to be enabled for this volume in the specified destination availability domains.
-        :param str cluster_placement_group_id: The OCID of the cluster placement group of the instance.
         :param str compartment_id: The OCID of the compartment containing images to search
         :param Mapping[str, Any] defined_tags: Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Operations.CostCenter": "42"}`
         :param str display_name: A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information.
@@ -26250,7 +26125,6 @@ class GetInstanceConfigurationInstanceDetailBlockVolumeCreateDetailResult(dict):
         pulumi.set(__self__, "availability_domain", availability_domain)
         pulumi.set(__self__, "backup_policy_id", backup_policy_id)
         pulumi.set(__self__, "block_volume_replicas", block_volume_replicas)
-        pulumi.set(__self__, "cluster_placement_group_id", cluster_placement_group_id)
         pulumi.set(__self__, "compartment_id", compartment_id)
         pulumi.set(__self__, "defined_tags", defined_tags)
         pulumi.set(__self__, "display_name", display_name)
@@ -26293,14 +26167,6 @@ class GetInstanceConfigurationInstanceDetailBlockVolumeCreateDetailResult(dict):
         """
         return pulumi.get(self, "block_volume_replicas")
 
-    @property
-    @pulumi.getter(name="clusterPlacementGroupId")
-    def cluster_placement_group_id(self) -> str:
-        """
-        The OCID of the cluster placement group of the instance.
-        """
-        return pulumi.get(self, "cluster_placement_group_id")
-
     @property
     @pulumi.getter(name="compartmentId")
     def compartment_id(self) -> str:
@@ -26465,7 +26331,6 @@ class GetInstanceConfigurationInstanceDetailLaunchDetailResult(dict):
                  availability_configs: Sequence['outputs.GetInstanceConfigurationInstanceDetailLaunchDetailAvailabilityConfigResult'],
                  availability_domain: str,
                  capacity_reservation_id: str,
-                 cluster_placement_group_id: str,
                  compartment_id: str,
                  create_vnic_details: Sequence['outputs.GetInstanceConfigurationInstanceDetailLaunchDetailCreateVnicDetailResult'],
                  dedicated_vm_host_id: str,
@@ -26491,7 +26356,6 @@ class GetInstanceConfigurationInstanceDetailLaunchDetailResult(dict):
         :param Sequence['GetInstanceConfigurationInstanceDetailLaunchDetailAvailabilityConfigArgs'] availability_configs: Options for defining the availabiity of a VM instance after a maintenance event that impacts the underlying hardware.
         :param str availability_domain: The availability domain of the instance.  Example: `Uocm:PHX-AD-1`
         :param str capacity_reservation_id: The OCID of the compute capacity reservation this instance is launched under.
-        :param str cluster_placement_group_id: The OCID of the cluster placement group of the instance.
         :param str compartment_id: The OCID of the compartment containing images to search
         :param Sequence['GetInstanceConfigurationInstanceDetailLaunchDetailCreateVnicDetailArgs'] create_vnic_details: Contains the properties of the VNIC for an instance configuration. See [CreateVnicDetails](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/CreateVnicDetails/) and [Instance Configurations](https://docs.cloud.oracle.com/iaas/Content/Compute/Concepts/instancemanagement.htm#config) for more information.
         :param str dedicated_vm_host_id: The OCID of the dedicated virtual machine host to place the instance on.
@@ -26516,7 +26380,6 @@ class GetInstanceConfigurationInstanceDetailLaunchDetailResult(dict):
         pulumi.set(__self__, "availability_configs", availability_configs)
         pulumi.set(__self__, "availability_domain", availability_domain)
         pulumi.set(__self__, "capacity_reservation_id", capacity_reservation_id)
-        pulumi.set(__self__, "cluster_placement_group_id", cluster_placement_group_id)
         pulumi.set(__self__, "compartment_id", compartment_id)
         pulumi.set(__self__, "create_vnic_details", create_vnic_details)
         pulumi.set(__self__, "dedicated_vm_host_id", dedicated_vm_host_id)
@@ -26570,14 +26433,6 @@ class GetInstanceConfigurationInstanceDetailLaunchDetailResult(dict):
         """
         return pulumi.get(self, "capacity_reservation_id")
 
-    @property
-    @pulumi.getter(name="clusterPlacementGroupId")
-    def cluster_placement_group_id(self) -> str:
-        """
-        The OCID of the cluster placement group of the instance.
-        """
-        return pulumi.get(self, "cluster_placement_group_id")
-
     @property
     @pulumi.getter(name="compartmentId")
     def compartment_id(self) -> str:
@@ -27658,7 +27513,6 @@ class GetInstanceConfigurationInstanceDetailOptionBlockVolumeCreateDetailResult(
                  availability_domain: str,
                  backup_policy_id: str,
                  block_volume_replicas: Sequence['outputs.GetInstanceConfigurationInstanceDetailOptionBlockVolumeCreateDetailBlockVolumeReplicaResult'],
-                 cluster_placement_group_id: str,
                  compartment_id: str,
                  defined_tags: Mapping[str, Any],
                  display_name: str,
@@ -27673,7 +27527,6 @@ class GetInstanceConfigurationInstanceDetailOptionBlockVolumeCreateDetailResult(
         :param str availability_domain: The availability domain of the instance.  Example: `Uocm:PHX-AD-1`
         :param str backup_policy_id: If provided, specifies the ID of the volume backup policy to assign to the newly created volume. If omitted, no policy will be assigned.
         :param Sequence['GetInstanceConfigurationInstanceDetailOptionBlockVolumeCreateDetailBlockVolumeReplicaArgs'] block_volume_replicas: The list of block volume replicas to be enabled for this volume in the specified destination availability domains.
-        :param str cluster_placement_group_id: The OCID of the cluster placement group of the instance.
         :param str compartment_id: The OCID of the compartment containing images to search
         :param Mapping[str, Any] defined_tags: Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Operations.CostCenter": "42"}`
         :param str display_name: A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information.
@@ -27687,7 +27540,6 @@ class GetInstanceConfigurationInstanceDetailOptionBlockVolumeCreateDetailResult(
         pulumi.set(__self__, "availability_domain", availability_domain)
         pulumi.set(__self__, "backup_policy_id", backup_policy_id)
         pulumi.set(__self__, "block_volume_replicas", block_volume_replicas)
-        pulumi.set(__self__, "cluster_placement_group_id", cluster_placement_group_id)
         pulumi.set(__self__, "compartment_id", compartment_id)
         pulumi.set(__self__, "defined_tags", defined_tags)
         pulumi.set(__self__, "display_name", display_name)
@@ -27730,14 +27582,6 @@ class GetInstanceConfigurationInstanceDetailOptionBlockVolumeCreateDetailResult(
         """
         return pulumi.get(self, "block_volume_replicas")
 
-    @property
-    @pulumi.getter(name="clusterPlacementGroupId")
-    def cluster_placement_group_id(self) -> str:
-        """
-        The OCID of the cluster placement group of the instance.
-        """
-        return pulumi.get(self, "cluster_placement_group_id")
-
     @property
     @pulumi.getter(name="compartmentId")
     def compartment_id(self) -> str:
@@ -27902,7 +27746,6 @@ class GetInstanceConfigurationInstanceDetailOptionLaunchDetailResult(dict):
                  availability_configs: Sequence['outputs.GetInstanceConfigurationInstanceDetailOptionLaunchDetailAvailabilityConfigResult'],
                  availability_domain: str,
                  capacity_reservation_id: str,
-                 cluster_placement_group_id: str,
                  compartment_id: str,
                  create_vnic_details: Sequence['outputs.GetInstanceConfigurationInstanceDetailOptionLaunchDetailCreateVnicDetailResult'],
                  dedicated_vm_host_id: str,
@@ -27928,7 +27771,6 @@ class GetInstanceConfigurationInstanceDetailOptionLaunchDetailResult(dict):
         :param Sequence['GetInstanceConfigurationInstanceDetailOptionLaunchDetailAvailabilityConfigArgs'] availability_configs: Options for defining the availabiity of a VM instance after a maintenance event that impacts the underlying hardware.
         :param str availability_domain: The availability domain of the instance.  Example: `Uocm:PHX-AD-1`
         :param str capacity_reservation_id: The OCID of the compute capacity reservation this instance is launched under.
-        :param str cluster_placement_group_id: The OCID of the cluster placement group of the instance.
         :param str compartment_id: The OCID of the compartment containing images to search
         :param Sequence['GetInstanceConfigurationInstanceDetailOptionLaunchDetailCreateVnicDetailArgs'] create_vnic_details: Contains the properties of the VNIC for an instance configuration. See [CreateVnicDetails](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/CreateVnicDetails/) and [Instance Configurations](https://docs.cloud.oracle.com/iaas/Content/Compute/Concepts/instancemanagement.htm#config) for more information.
         :param str dedicated_vm_host_id: The OCID of the dedicated virtual machine host to place the instance on.
@@ -27953,7 +27795,6 @@ class GetInstanceConfigurationInstanceDetailOptionLaunchDetailResult(dict):
         pulumi.set(__self__, "availability_configs", availability_configs)
         pulumi.set(__self__, "availability_domain", availability_domain)
         pulumi.set(__self__, "capacity_reservation_id", capacity_reservation_id)
-        pulumi.set(__self__, "cluster_placement_group_id", cluster_placement_group_id)
         pulumi.set(__self__, "compartment_id", compartment_id)
         pulumi.set(__self__, "create_vnic_details", create_vnic_details)
         pulumi.set(__self__, "dedicated_vm_host_id", dedicated_vm_host_id)
@@ -28007,14 +27848,6 @@ class GetInstanceConfigurationInstanceDetailOptionLaunchDetailResult(dict):
         """
         return pulumi.get(self, "capacity_reservation_id")
 
-    @property
-    @pulumi.getter(name="clusterPlacementGroupId")
-    def cluster_placement_group_id(self) -> str:
-        """
-        The OCID of the cluster placement group of the instance.
-        """
-        return pulumi.get(self, "cluster_placement_group_id")
-
     @property
     @pulumi.getter(name="compartmentId")
     def compartment_id(self) -> str:
@@ -29660,7 +29493,6 @@ class GetInstanceConfigurationsInstanceConfigurationInstanceDetailBlockVolumeCre
                  availability_domain: str,
                  backup_policy_id: str,
                  block_volume_replicas: Sequence['outputs.GetInstanceConfigurationsInstanceConfigurationInstanceDetailBlockVolumeCreateDetailBlockVolumeReplicaResult'],
-                 cluster_placement_group_id: str,
                  compartment_id: str,
                  defined_tags: Mapping[str, Any],
                  display_name: str,
@@ -29675,7 +29507,6 @@ class GetInstanceConfigurationsInstanceConfigurationInstanceDetailBlockVolumeCre
         :param str availability_domain: The availability domain of the instance.  Example: `Uocm:PHX-AD-1`
         :param str backup_policy_id: If provided, specifies the ID of the volume backup policy to assign to the newly created volume. If omitted, no policy will be assigned.
         :param Sequence['GetInstanceConfigurationsInstanceConfigurationInstanceDetailBlockVolumeCreateDetailBlockVolumeReplicaArgs'] block_volume_replicas: The list of block volume replicas to be enabled for this volume in the specified destination availability domains.
-        :param str cluster_placement_group_id: The OCID of the cluster placement group of the instance.
         :param str compartment_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment.
         :param Mapping[str, Any] defined_tags: Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Operations.CostCenter": "42"}`
         :param str display_name: A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information.
@@ -29689,7 +29520,6 @@ class GetInstanceConfigurationsInstanceConfigurationInstanceDetailBlockVolumeCre
         pulumi.set(__self__, "availability_domain", availability_domain)
         pulumi.set(__self__, "backup_policy_id", backup_policy_id)
         pulumi.set(__self__, "block_volume_replicas", block_volume_replicas)
-        pulumi.set(__self__, "cluster_placement_group_id", cluster_placement_group_id)
         pulumi.set(__self__, "compartment_id", compartment_id)
         pulumi.set(__self__, "defined_tags", defined_tags)
         pulumi.set(__self__, "display_name", display_name)
@@ -29732,14 +29562,6 @@ class GetInstanceConfigurationsInstanceConfigurationInstanceDetailBlockVolumeCre
         """
         return pulumi.get(self, "block_volume_replicas")
 
-    @property
-    @pulumi.getter(name="clusterPlacementGroupId")
-    def cluster_placement_group_id(self) -> str:
-        """
-        The OCID of the cluster placement group of the instance.
-        """
-        return pulumi.get(self, "cluster_placement_group_id")
-
     @property
     @pulumi.getter(name="compartmentId")
     def compartment_id(self) -> str:
@@ -29904,7 +29726,6 @@ class GetInstanceConfigurationsInstanceConfigurationInstanceDetailLaunchDetailRe
                  availability_configs: Sequence['outputs.GetInstanceConfigurationsInstanceConfigurationInstanceDetailLaunchDetailAvailabilityConfigResult'],
                  availability_domain: str,
                  capacity_reservation_id: str,
-                 cluster_placement_group_id: str,
                  compartment_id: str,
                  create_vnic_details: Sequence['outputs.GetInstanceConfigurationsInstanceConfigurationInstanceDetailLaunchDetailCreateVnicDetailResult'],
                  dedicated_vm_host_id: str,
@@ -29930,7 +29751,6 @@ class GetInstanceConfigurationsInstanceConfigurationInstanceDetailLaunchDetailRe
         :param Sequence['GetInstanceConfigurationsInstanceConfigurationInstanceDetailLaunchDetailAvailabilityConfigArgs'] availability_configs: Options for defining the availabiity of a VM instance after a maintenance event that impacts the underlying hardware.
         :param str availability_domain: The availability domain of the instance.  Example: `Uocm:PHX-AD-1`
         :param str capacity_reservation_id: The OCID of the compute capacity reservation this instance is launched under.
-        :param str cluster_placement_group_id: The OCID of the cluster placement group of the instance.
         :param str compartment_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment.
         :param Sequence['GetInstanceConfigurationsInstanceConfigurationInstanceDetailLaunchDetailCreateVnicDetailArgs'] create_vnic_details: Contains the properties of the VNIC for an instance configuration. See [CreateVnicDetails](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/CreateVnicDetails/) and [Instance Configurations](https://docs.cloud.oracle.com/iaas/Content/Compute/Concepts/instancemanagement.htm#config) for more information.
         :param str dedicated_vm_host_id: The OCID of the dedicated virtual machine host to place the instance on.
@@ -29955,7 +29775,6 @@ class GetInstanceConfigurationsInstanceConfigurationInstanceDetailLaunchDetailRe
         pulumi.set(__self__, "availability_configs", availability_configs)
         pulumi.set(__self__, "availability_domain", availability_domain)
         pulumi.set(__self__, "capacity_reservation_id", capacity_reservation_id)
-        pulumi.set(__self__, "cluster_placement_group_id", cluster_placement_group_id)
         pulumi.set(__self__, "compartment_id", compartment_id)
         pulumi.set(__self__, "create_vnic_details", create_vnic_details)
         pulumi.set(__self__, "dedicated_vm_host_id", dedicated_vm_host_id)
@@ -30009,14 +29828,6 @@ class GetInstanceConfigurationsInstanceConfigurationInstanceDetailLaunchDetailRe
         """
         return pulumi.get(self, "capacity_reservation_id")
 
-    @property
-    @pulumi.getter(name="clusterPlacementGroupId")
-    def cluster_placement_group_id(self) -> str:
-        """
-        The OCID of the cluster placement group of the instance.
-        """
-        return pulumi.get(self, "cluster_placement_group_id")
-
     @property
     @pulumi.getter(name="compartmentId")
     def compartment_id(self) -> str:
@@ -31097,7 +30908,6 @@ class GetInstanceConfigurationsInstanceConfigurationInstanceDetailOptionBlockVol
                  availability_domain: str,
                  backup_policy_id: str,
                  block_volume_replicas: Sequence['outputs.GetInstanceConfigurationsInstanceConfigurationInstanceDetailOptionBlockVolumeCreateDetailBlockVolumeReplicaResult'],
-                 cluster_placement_group_id: str,
                  compartment_id: str,
                  defined_tags: Mapping[str, Any],
                  display_name: str,
@@ -31112,7 +30922,6 @@ class GetInstanceConfigurationsInstanceConfigurationInstanceDetailOptionBlockVol
         :param str availability_domain: The availability domain of the instance.  Example: `Uocm:PHX-AD-1`
         :param str backup_policy_id: If provided, specifies the ID of the volume backup policy to assign to the newly created volume. If omitted, no policy will be assigned.
         :param Sequence['GetInstanceConfigurationsInstanceConfigurationInstanceDetailOptionBlockVolumeCreateDetailBlockVolumeReplicaArgs'] block_volume_replicas: The list of block volume replicas to be enabled for this volume in the specified destination availability domains.
-        :param str cluster_placement_group_id: The OCID of the cluster placement group of the instance.
         :param str compartment_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment.
         :param Mapping[str, Any] defined_tags: Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Operations.CostCenter": "42"}`
         :param str display_name: A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information.
@@ -31126,7 +30935,6 @@ class GetInstanceConfigurationsInstanceConfigurationInstanceDetailOptionBlockVol
         pulumi.set(__self__, "availability_domain", availability_domain)
         pulumi.set(__self__, "backup_policy_id", backup_policy_id)
         pulumi.set(__self__, "block_volume_replicas", block_volume_replicas)
-        pulumi.set(__self__, "cluster_placement_group_id", cluster_placement_group_id)
         pulumi.set(__self__, "compartment_id", compartment_id)
         pulumi.set(__self__, "defined_tags", defined_tags)
         pulumi.set(__self__, "display_name", display_name)
@@ -31169,14 +30977,6 @@ class GetInstanceConfigurationsInstanceConfigurationInstanceDetailOptionBlockVol
         """
         return pulumi.get(self, "block_volume_replicas")
 
-    @property
-    @pulumi.getter(name="clusterPlacementGroupId")
-    def cluster_placement_group_id(self) -> str:
-        """
-        The OCID of the cluster placement group of the instance.
-        """
-        return pulumi.get(self, "cluster_placement_group_id")
-
     @property
     @pulumi.getter(name="compartmentId")
     def compartment_id(self) -> str:
@@ -31341,7 +31141,6 @@ class GetInstanceConfigurationsInstanceConfigurationInstanceDetailOptionLaunchDe
                  availability_configs: Sequence['outputs.GetInstanceConfigurationsInstanceConfigurationInstanceDetailOptionLaunchDetailAvailabilityConfigResult'],
                  availability_domain: str,
                  capacity_reservation_id: str,
-                 cluster_placement_group_id: str,
                  compartment_id: str,
                  create_vnic_details: Sequence['outputs.GetInstanceConfigurationsInstanceConfigurationInstanceDetailOptionLaunchDetailCreateVnicDetailResult'],
                  dedicated_vm_host_id: str,
@@ -31367,7 +31166,6 @@ class GetInstanceConfigurationsInstanceConfigurationInstanceDetailOptionLaunchDe
         :param Sequence['GetInstanceConfigurationsInstanceConfigurationInstanceDetailOptionLaunchDetailAvailabilityConfigArgs'] availability_configs: Options for defining the availabiity of a VM instance after a maintenance event that impacts the underlying hardware.
         :param str availability_domain: The availability domain of the instance.  Example: `Uocm:PHX-AD-1`
         :param str capacity_reservation_id: The OCID of the compute capacity reservation this instance is launched under.
-        :param str cluster_placement_group_id: The OCID of the cluster placement group of the instance.
         :param str compartment_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment.
         :param Sequence['GetInstanceConfigurationsInstanceConfigurationInstanceDetailOptionLaunchDetailCreateVnicDetailArgs'] create_vnic_details: Contains the properties of the VNIC for an instance configuration. See [CreateVnicDetails](https://docs.cloud.oracle.com/iaas/api/#/en/iaas/latest/CreateVnicDetails/) and [Instance Configurations](https://docs.cloud.oracle.com/iaas/Content/Compute/Concepts/instancemanagement.htm#config) for more information.
         :param str dedicated_vm_host_id: The OCID of the dedicated virtual machine host to place the instance on.
@@ -31392,7 +31190,6 @@ class GetInstanceConfigurationsInstanceConfigurationInstanceDetailOptionLaunchDe
         pulumi.set(__self__, "availability_configs", availability_configs)
         pulumi.set(__self__, "availability_domain", availability_domain)
         pulumi.set(__self__, "capacity_reservation_id", capacity_reservation_id)
-        pulumi.set(__self__, "cluster_placement_group_id", cluster_placement_group_id)
         pulumi.set(__self__, "compartment_id", compartment_id)
         pulumi.set(__self__, "create_vnic_details", create_vnic_details)
         pulumi.set(__self__, "dedicated_vm_host_id", dedicated_vm_host_id)
@@ -31446,14 +31243,6 @@ class GetInstanceConfigurationsInstanceConfigurationInstanceDetailOptionLaunchDe
         """
         return pulumi.get(self, "capacity_reservation_id")
 
-    @property
-    @pulumi.getter(name="clusterPlacementGroupId")
-    def cluster_placement_group_id(self) -> str:
-        """
-        The OCID of the cluster placement group of the instance.
-        """
-        return pulumi.get(self, "cluster_placement_group_id")
-
     @property
     @pulumi.getter(name="compartmentId")
     def compartment_id(self) -> str:
@@ -33947,6 +33736,7 @@ class GetInstancePoolPlacementConfigurationResult(dict):
         """
         :param str availability_domain: The availability domain to place instances.  Example: `Uocm:PHX-AD-1`
         :param Sequence[str] fault_domains: The fault domains to place instances.
+        :param str primary_subnet_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the primary subnet to place instances. This field is deprecated. Use `primaryVnicSubnets` instead to set VNIC data for instances in the pool.
         :param Sequence['GetInstancePoolPlacementConfigurationPrimaryVnicSubnetArgs'] primary_vnic_subnets: Details about the IPv6 primary subnet.
         :param Sequence['GetInstancePoolPlacementConfigurationSecondaryVnicSubnetArgs'] secondary_vnic_subnets: The set of secondary VNIC data for instances in the pool.
         """
@@ -33975,6 +33765,9 @@ class GetInstancePoolPlacementConfigurationResult(dict):
     @property
     @pulumi.getter(name="primarySubnetId")
     def primary_subnet_id(self) -> str:
+        """
+        The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the primary subnet to place instances. This field is deprecated. Use `primaryVnicSubnets` instead to set VNIC data for instances in the pool.
+        """
         return pulumi.get(self, "primary_subnet_id")
 
     @property
@@ -34400,6 +34193,7 @@ class GetInstancePoolsInstancePoolPlacementConfigurationResult(dict):
         """
         :param str availability_domain: The availability domain to place instances.  Example: `Uocm:PHX-AD-1`
         :param Sequence[str] fault_domains: The fault domains to place instances.
+        :param str primary_subnet_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the primary subnet to place instances. This field is deprecated. Use `primaryVnicSubnets` instead to set VNIC data for instances in the pool.
         :param Sequence['GetInstancePoolsInstancePoolPlacementConfigurationPrimaryVnicSubnetArgs'] primary_vnic_subnets: Details about the IPv6 primary subnet.
         :param Sequence['GetInstancePoolsInstancePoolPlacementConfigurationSecondaryVnicSubnetArgs'] secondary_vnic_subnets: The set of secondary VNIC data for instances in the pool.
         """
@@ -34428,6 +34222,9 @@ class GetInstancePoolsInstancePoolPlacementConfigurationResult(dict):
     @property
     @pulumi.getter(name="primarySubnetId")
     def primary_subnet_id(self) -> str:
+        """
+        The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the primary subnet to place instances. This field is deprecated. Use `primaryVnicSubnets` instead to set VNIC data for instances in the pool.
+        """
         return pulumi.get(self, "primary_subnet_id")
 
     @property
@@ -34773,7 +34570,6 @@ class GetInstanceSourceDetailResult(dict):
                  boot_volume_size_in_gbs: str,
                  boot_volume_vpus_per_gb: str,
                  instance_source_image_filter_details: Sequence['outputs.GetInstanceSourceDetailInstanceSourceImageFilterDetailResult'],
-                 is_preserve_boot_volume_enabled: bool,
                  kms_key_id: str,
                  source_id: str,
                  source_type: str):
@@ -34788,7 +34584,6 @@ class GetInstanceSourceDetailResult(dict):
         pulumi.set(__self__, "boot_volume_size_in_gbs", boot_volume_size_in_gbs)
         pulumi.set(__self__, "boot_volume_vpus_per_gb", boot_volume_vpus_per_gb)
         pulumi.set(__self__, "instance_source_image_filter_details", instance_source_image_filter_details)
-        pulumi.set(__self__, "is_preserve_boot_volume_enabled", is_preserve_boot_volume_enabled)
         pulumi.set(__self__, "kms_key_id", kms_key_id)
         pulumi.set(__self__, "source_id", source_id)
         pulumi.set(__self__, "source_type", source_type)
@@ -34817,11 +34612,6 @@ class GetInstanceSourceDetailResult(dict):
         """
         return pulumi.get(self, "instance_source_image_filter_details")
 
-    @property
-    @pulumi.getter(name="isPreserveBootVolumeEnabled")
-    def is_preserve_boot_volume_enabled(self) -> bool:
-        return pulumi.get(self, "is_preserve_boot_volume_enabled")
-
     @property
     @pulumi.getter(name="kmsKeyId")
     def kms_key_id(self) -> str:
@@ -34940,7 +34730,6 @@ class GetInstancesInstanceResult(dict):
                  availability_domain: str,
                  boot_volume_id: str,
                  capacity_reservation_id: str,
-                 cluster_placement_group_id: str,
                  compartment_id: str,
                  compute_cluster_id: str,
                  create_vnic_details: Sequence['outputs.GetInstancesInstanceCreateVnicDetailResult'],
@@ -34984,7 +34773,6 @@ class GetInstancesInstanceResult(dict):
         :param str availability_domain: The name of the availability domain.  Example: `Uocm:PHX-AD-1`
         :param str boot_volume_id: The OCID of the attached boot volume. If the `source_type` is `bootVolume`, this will be the same OCID as the `source_id`.
         :param str capacity_reservation_id: The OCID of the compute capacity reservation.
-        :param str cluster_placement_group_id: The OCID of the cluster placement group of the instance.
         :param str compartment_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment.
         :param str compute_cluster_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compute cluster. A [compute cluster](https://docs.cloud.oracle.com/iaas/Content/Compute/Tasks/compute-clusters.htm) is a remote direct memory access (RDMA) network group.
         :param str dedicated_vm_host_id: The OCID of the dedicated virtual machine host that the instance is placed on.
@@ -35020,7 +34808,6 @@ class GetInstancesInstanceResult(dict):
         pulumi.set(__self__, "availability_domain", availability_domain)
         pulumi.set(__self__, "boot_volume_id", boot_volume_id)
         pulumi.set(__self__, "capacity_reservation_id", capacity_reservation_id)
-        pulumi.set(__self__, "cluster_placement_group_id", cluster_placement_group_id)
         pulumi.set(__self__, "compartment_id", compartment_id)
         pulumi.set(__self__, "compute_cluster_id", compute_cluster_id)
         pulumi.set(__self__, "create_vnic_details", create_vnic_details)
@@ -35104,14 +34891,6 @@ class GetInstancesInstanceResult(dict):
         """
         return pulumi.get(self, "capacity_reservation_id")
 
-    @property
-    @pulumi.getter(name="clusterPlacementGroupId")
-    def cluster_placement_group_id(self) -> str:
-        """
-        The OCID of the cluster placement group of the instance.
-        """
-        return pulumi.get(self, "cluster_placement_group_id")
-
     @property
     @pulumi.getter(name="compartmentId")
     def compartment_id(self) -> str:
@@ -36204,7 +35983,6 @@ class GetInstancesInstanceSourceDetailResult(dict):
                  boot_volume_size_in_gbs: str,
                  boot_volume_vpus_per_gb: str,
                  instance_source_image_filter_details: Sequence['outputs.GetInstancesInstanceSourceDetailInstanceSourceImageFilterDetailResult'],
-                 is_preserve_boot_volume_enabled: bool,
                  kms_key_id: str,
                  source_id: str,
                  source_type: str):
@@ -36219,7 +35997,6 @@ class GetInstancesInstanceSourceDetailResult(dict):
         pulumi.set(__self__, "boot_volume_size_in_gbs", boot_volume_size_in_gbs)
         pulumi.set(__self__, "boot_volume_vpus_per_gb", boot_volume_vpus_per_gb)
         pulumi.set(__self__, "instance_source_image_filter_details", instance_source_image_filter_details)
-        pulumi.set(__self__, "is_preserve_boot_volume_enabled", is_preserve_boot_volume_enabled)
         pulumi.set(__self__, "kms_key_id", kms_key_id)
         pulumi.set(__self__, "source_id", source_id)
         pulumi.set(__self__, "source_type", source_type)
@@ -36248,11 +36025,6 @@ class GetInstancesInstanceSourceDetailResult(dict):
         """
         return pulumi.get(self, "instance_source_image_filter_details")
 
-    @property
-    @pulumi.getter(name="isPreserveBootVolumeEnabled")
-    def is_preserve_boot_volume_enabled(self) -> bool:
-        return pulumi.get(self, "is_preserve_boot_volume_enabled")
-
     @property
     @pulumi.getter(name="kmsKeyId")
     def kms_key_id(self) -> str:
@@ -45051,7 +44823,6 @@ class GetVolumeAttachmentsVolumeAttachmentResult(dict):
                  is_pv_encryption_in_transit_enabled: bool,
                  is_read_only: bool,
                  is_shareable: bool,
-                 is_volume_created_during_launch: bool,
                  iscsi_login_state: str,
                  multipath_devices: Sequence['outputs.GetVolumeAttachmentsVolumeAttachmentMultipathDeviceResult'],
                  port: int,
@@ -45076,7 +44847,6 @@ class GetVolumeAttachmentsVolumeAttachmentResult(dict):
         :param bool is_multipath: Whether the Iscsi or Paravirtualized attachment is multipath or not, it is not applicable to NVMe attachment.
         :param bool is_pv_encryption_in_transit_enabled: Whether in-transit encryption for the data volume's paravirtualized attachment is enabled or not.
         :param bool is_read_only: Whether the attachment was created in read-only mode.
-        :param bool is_volume_created_during_launch: Flag indicating if this volume was created for the customer as part of a simplified launch. Used to determine whether the volume requires deletion on instance termination.
         :param str iscsi_login_state: The iscsi login state of the volume attachment. For a Iscsi volume attachment, all iscsi sessions need to be all logged-in or logged-out to be in logged-in or logged-out state.
         :param Sequence['GetVolumeAttachmentsVolumeAttachmentMultipathDeviceArgs'] multipath_devices: A list of secondary multipath devices
         :param int port: The volume's iSCSI port, usually port 860 or 3260.  Example: `3260`
@@ -45101,7 +44871,6 @@ class GetVolumeAttachmentsVolumeAttachmentResult(dict):
         pulumi.set(__self__, "is_pv_encryption_in_transit_enabled", is_pv_encryption_in_transit_enabled)
         pulumi.set(__self__, "is_read_only", is_read_only)
         pulumi.set(__self__, "is_shareable", is_shareable)
-        pulumi.set(__self__, "is_volume_created_during_launch", is_volume_created_during_launch)
         pulumi.set(__self__, "iscsi_login_state", iscsi_login_state)
         pulumi.set(__self__, "multipath_devices", multipath_devices)
         pulumi.set(__self__, "port", port)
@@ -45246,14 +45015,6 @@ class GetVolumeAttachmentsVolumeAttachmentResult(dict):
     def is_shareable(self) -> bool:
         return pulumi.get(self, "is_shareable")
 
-    @property
-    @pulumi.getter(name="isVolumeCreatedDuringLaunch")
-    def is_volume_created_during_launch(self) -> bool:
-        """
-        Flag indicating if this volume was created for the customer as part of a simplified launch. Used to determine whether the volume requires deletion on instance termination.
-        """
-        return pulumi.get(self, "is_volume_created_during_launch")
-
     @property
     @pulumi.getter(name="iscsiLoginState")
     def iscsi_login_state(self) -> str:
@@ -46543,7 +46304,6 @@ class GetVolumeGroupsVolumeGroupResult(dict):
     def __init__(__self__, *,
                  availability_domain: str,
                  backup_policy_id: str,
-                 cluster_placement_group_id: str,
                  compartment_id: str,
                  defined_tags: Mapping[str, Any],
                  display_name: str,
@@ -46577,7 +46337,6 @@ class GetVolumeGroupsVolumeGroupResult(dict):
         """
         pulumi.set(__self__, "availability_domain", availability_domain)
         pulumi.set(__self__, "backup_policy_id", backup_policy_id)
-        pulumi.set(__self__, "cluster_placement_group_id", cluster_placement_group_id)
         pulumi.set(__self__, "compartment_id", compartment_id)
         pulumi.set(__self__, "defined_tags", defined_tags)
         pulumi.set(__self__, "display_name", display_name)
@@ -46610,11 +46369,6 @@ class GetVolumeGroupsVolumeGroupResult(dict):
 
         return pulumi.get(self, "backup_policy_id")
 
-    @property
-    @pulumi.getter(name="clusterPlacementGroupId")
-    def cluster_placement_group_id(self) -> str:
-        return pulumi.get(self, "cluster_placement_group_id")
-
     @property
     @pulumi.getter(name="compartmentId")
     def compartment_id(self) -> str:
@@ -46897,7 +46651,6 @@ class GetVolumesVolumeResult(dict):
                  backup_policy_id: str,
                  block_volume_replicas: Sequence['outputs.GetVolumesVolumeBlockVolumeReplicaResult'],
                  block_volume_replicas_deletion: bool,
-                 cluster_placement_group_id: str,
                  compartment_id: str,
                  defined_tags: Mapping[str, Any],
                  display_name: str,
@@ -46920,7 +46673,6 @@ class GetVolumesVolumeResult(dict):
         :param Sequence['GetVolumesVolumeAutotunePolicyArgs'] autotune_policies: The list of autotune policies enabled for this volume.
         :param str availability_domain: The name of the availability domain.  Example: `Uocm:PHX-AD-1`
         :param Sequence['GetVolumesVolumeBlockVolumeReplicaArgs'] block_volume_replicas: The list of block volume replicas of this volume.
-        :param str cluster_placement_group_id: A filter to return only resources that match the given cluster placement group Id exactly.
         :param str compartment_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment.
         :param Mapping[str, Any] defined_tags: Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Operations.CostCenter": "42"}`
         :param str display_name: A filter to return only resources that match the given display name exactly.
@@ -46943,7 +46695,6 @@ class GetVolumesVolumeResult(dict):
         pulumi.set(__self__, "backup_policy_id", backup_policy_id)
         pulumi.set(__self__, "block_volume_replicas", block_volume_replicas)
         pulumi.set(__self__, "block_volume_replicas_deletion", block_volume_replicas_deletion)
-        pulumi.set(__self__, "cluster_placement_group_id", cluster_placement_group_id)
         pulumi.set(__self__, "compartment_id", compartment_id)
         pulumi.set(__self__, "defined_tags", defined_tags)
         pulumi.set(__self__, "display_name", display_name)
@@ -47007,14 +46758,6 @@ class GetVolumesVolumeResult(dict):
     def block_volume_replicas_deletion(self) -> bool:
         return pulumi.get(self, "block_volume_replicas_deletion")
 
-    @property
-    @pulumi.getter(name="clusterPlacementGroupId")
-    def cluster_placement_group_id(self) -> str:
-        """
-        A filter to return only resources that match the given cluster placement group Id exactly.
-        """
-        return pulumi.get(self, "cluster_placement_group_id")
-
     @property
     @pulumi.getter(name="compartmentId")
     def compartment_id(self) -> str: