From ea1e3626f03eaa9a490e242d4ec587cf85dfe09c Mon Sep 17 00:00:00 2001 From: Kenneth Lakin Date: Wed, 5 Apr 2023 12:25:24 -0700 Subject: [PATCH] Make disk type examples consistent across CPIs Makes formatting consistent and removes references to the v1 disk_pools (v2 disk_types). Signed-off-by: Brian Upton --- content/aws-cpi.md | 3 +-- content/azure-cpi.md | 4 +--- content/openstack-cpi.md | 3 +-- content/vsphere-cpi.md | 5 +---- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/content/aws-cpi.md b/content/aws-cpi.md index f39b306c..a913dac2 100644 --- a/content/aws-cpi.md +++ b/content/aws-cpi.md @@ -103,7 +103,7 @@ Schema for `cloud_properties` section: * `gp3` stands for EBS next-generation general purpose drives (SSD) * **iops** [Integer, optional]: Specifies the number of I/O operations per second to provision for the drive. * Only valid for `io1` and `gp3` type drive. - * Required when `io1` type drive is specified. + * Required when `io1` type drive is specified. * Optional for `gp3`, defaults to AWS default iops count if iops < AWS default (added with [v93](https://github.com/cloudfoundry/bosh-aws-cpi-release/releases/tag/v93)). * **throughput** [Integer, optional]: Specifies Throughput in MBp/s * Only valid for `gp3` type drive. @@ -151,7 +151,6 @@ EBS volumes are created in the availability zone of an instance that volume will Example of 10GB disk: ```yaml -disk_pools: - name: default disk_size: 10_240 cloud_properties: diff --git a/content/azure-cpi.md b/content/azure-cpi.md index 80f7ac48..f83a5fba 100644 --- a/content/azure-cpi.md +++ b/content/azure-cpi.md @@ -310,11 +310,9 @@ Schema for `cloud_properties` section: * **caching** [String, optional]: Type of the disk caching. It can be either `None`, `ReadOnly` or `ReadWrite`. Default is `None`. * **storage\_account\_type** [String, optional]: Storage account type. Valid only when `use_managed_disks` is `true`. It can be either `Standard_LRS` or `Premium_LRS`. You can click [**HERE**](http://azure.microsoft.com/en-us/pricing/details/storage/) to learn more about the type of Azure storage account. - -Example of 10GB disk: - * **disk_size** [Integer, required]: Size of the disk in MiB. On Azure the disk size must be greater than 1 * 1024 and less than the max disk size for [unmanaged](https://azure.microsoft.com/en-us/pricing/details/storage/unmanaged-disks/) or [managed](https://azure.microsoft.com/en-us/pricing/details/managed-disks/) disk. Please always use `N * 1024` as the size because Azure always uses GiB not MiB. +Example of 10GB disk: ```yaml disk_types: - name: default diff --git a/content/openstack-cpi.md b/content/openstack-cpi.md index f912a3b9..e3e8faf9 100644 --- a/content/openstack-cpi.md +++ b/content/openstack-cpi.md @@ -130,10 +130,9 @@ Schema for `cloud_properties` section: Cinder volumes are created in the availability zone of an instance that volume will be attached. -Example of 10GB SSD disk: +Example of 10GB disk: ```yaml -disk_pools: - name: default disk_size: 10_240 cloud_properties: diff --git a/content/vsphere-cpi.md b/content/vsphere-cpi.md index c7f9e8f6..0a4786db 100644 --- a/content/vsphere-cpi.md +++ b/content/vsphere-cpi.md @@ -179,7 +179,6 @@ Schema for `cloud_properties` section: Example of 10GB disk: ```yaml -disk_pools: - name: default disk_size: 10_240 ``` @@ -187,7 +186,6 @@ disk_pools: Example of disk with type eagerZeroedThick: ```yaml -disk_pools: - name: default disk_size: 10_240 cloud_properties: @@ -197,7 +195,6 @@ disk_pools: Example of disk stored in specific datastores: ```yaml -disk_pools: - name: default disk_size: 10_240 cloud_properties: @@ -464,7 +461,7 @@ For any VM created on this cluster with host group specification , vSphere CPI When placing a VM, a cluster is chosen (along with a datastore) based on the VM's memory, ephemeral disk, and persistent disk requirements. -VMs are placed on clusters and datastores based on a weighted random algorithm. The weights are calculated by how many times the requested memory, ephemeral and persistent disk could fit on the cluster. +VMs are placed on clusters and datastores based on a weighted random algorithm. The weights are calculated by how many times the requested memory, ephemeral and persistent disk could fit on the cluster. This means the VMs will be placed according to the following rules.