Update IPI docs

Author: alishaIBM

modules/creating-ibm-power-vs-workspace-procedure.adoc

@@ -10,10 +10,10 @@ Use the following procedure to create an {ibmpowerProductName} Virtual Server wo
 
 . To create an {ibmpowerProductName} Virtual Server workspace, complete step 1 to step 5 from the IBM Cloud documentation for link:https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-creating-power-virtual-server[Creating an IBM Power Virtual Server].
 
-. After it has finished provisioning, retrieve the 32-character alphanumeric ID of your new workspace by entering the following command:
+. After it has finished provisioning, retrieve the 32-character alphanumeric Globally Unique Identifier (GUID) of your new workspace by entering the following command:
 +
 [source,terminal]
 ----
-$ ibmcloud resource service-instances | grep <workspace name>
+$ ibmcloud resource service-instance <workspace name>
 ----
 +

modules/installation-cis-ibm-cloud.adoc

@@ -3,6 +3,10 @@
 // installing/installing_ibm_cloud_public/installing-ibm-cloud-account.adoc
 // installing/installing_ibm_powervs/installing-ibm-cloud-account-power-vs.adoc
 
+ifeval::["{context}" == "installing-ibm-cloud-account-power-vs"]
+:ibm-power-vs:
+endif::[]
+
 :_content-type: PROCEDURE
 [id="installation-cis-ibm-cloud_{context}"]
 = Using IBM Cloud Internet Services for DNS resolution
@@ -32,6 +36,15 @@ You must create a domain zone in CIS in the same account as your cluster. You mu
 $ ibmcloud plugin install cis
 ----
 
+ifdef::ibm-power-vs[]
+.. Log in to IBM Cloud by using the CLI:
++
+[source,terminal]
+----
+$ ibmcloud login
+----
+endif::ibm-power-vs[]
+
 .. Create the CIS instance:
 +
 [source,terminal]
@@ -43,12 +56,23 @@ $ ibmcloud cis instance-create <instance_name> standard <1>
 . Connect an existing domain to your CIS instance:
 
 .. Set the context instance for CIS:
+ifndef::ibm-power-vs[]
 +
 [source,terminal]
 ----
 $ ibmcloud cis instance-set <instance_name> <1>
 ----
 <1> The instance cloud resource name.
+endif::ibm-power-vs[]
+ifdef::ibm-power-vs[]
++
+[source,terminal]
+----
+$ ibmcloud cis instance-set <instance_CRN> <1>
+----
+<1> The instance CRN (Cloud Resource Name).
+For example: `ibmcloud cis instance-set crn:v1:bluemix:public:power-iaas:osa21:a/65b64c1f1c29460d8c2e4bbfbd893c2c:c09233ac-48a5-4ccb-a051-d1cfb3fc7eb5::`
+endif::ibm-power-vs[]
 
 .. Add the domain for CIS:
 +
@@ -65,4 +89,8 @@ A root domain uses the form `openshiftcorp.com`. A subdomain uses the form `clus
 
 . Open the link:https://cloud.ibm.com/catalog/services/internet-services[CIS web console], navigate to the *Overview* page, and note your CIS name servers. These name servers will be used in the next step.
 
-. Configure the name servers for your domains or subdomains at the domain's registrar or DNS provider. For more information, see the IBM Cloud link:https://cloud.ibm.com/docs/cis?topic=cis-getting-started#configure-your-name-servers-with-the-registrar-or-existing-dns-provider[documentation].
+. Configure the name servers for your domains or subdomains at the domain's registrar or DNS provider. For more information, see the IBM Cloud link:https://cloud.ibm.com/docs/cis?topic=cis-getting-started#configure-your-name-servers-with-the-registrar-or-existing-dns-provider[documentation].
+
+ifeval::["{context}" == "installing-ibm-cloud-account-power-vs"]
+:!ibm-power-vs:
+endif::[]

modules/installation-configuration-parameters.adoc

@@ -123,6 +123,27 @@ ifndef::openshift-origin[]
 ----
 endif::[]
 
+ifdef::ibm-power-vs[]
+|`platform.powervs.userID`
+|The UserID is the login for the user's IBM Cloud account.
+|String. For example, `existing_user_id`.
+
+|`platform.powervs.powervsResourceGroup`
+|The PowerVSResourceGroup is the resource group in which {ibmpowerProductName} Virtual Server resources are created. If using an existing VPC, the existing VPC and subnets should be in this resource group.
+|String. For example, `existing_resource_group`.
+
+|`platform.powervs.region`
+|Specifies the IBM Cloud colo region where the cluster will be created.
+|String. For example, `existing_region`.
+
+|`platform.powervs.zone`
+|Specifies the IBM Cloud colo region where the cluster will be created.
+|String. For example, `existing_zone`.
+
+|`platform.powervs.serviceInstanceID`
+|The ServiceInstanceID is the ID of the Power IAAS instance created from the IBM Cloud Catalog.
+|String. For example, `existing_service_instance_ID`.
+endif::ibm-power-vs[]
 |====
 
 [id="installation-configuration-parameters-network_{context}"]
@@ -593,6 +614,47 @@ For production {product-title} clusters on which you want to perform installatio
 ====
 a|For example, `sshKey: ssh-ed25519 AAAA..`.
 
+ifdef::ibm-power-vs[]
+|`platform.powervs.vpcRegion`
+|Specifies the IBM Cloud region in which to create VPC resources.
+|String. For example, `existing_vpc_region`.
+
+|`platform.powervs.vpcSubnets`
+|Specifies existing subnets (by name) where cluster resources will be created.
+|String. For example, `powervs_region_example_subnet`.
+
+|`platform.powervs.vpcName`
+|Specifies the IBM Cloud VPC name.
+|String. For example, `existing_vpcName`.
+
+|`platform.powervs.cloudConnectionName`
+|The CloudConnectionName is the name of an existing PowerVS Cloud connection.
+|String. For example, `existing_cloudConnectionName`.
+
+|`platform.powervs.clusterOSImage`
+|The ClusterOSImage is a pre-created {ibmpowerProductName} Virtual Server boot image that overrides the default image for cluster nodes.
+|String. For example, `existing_cluster_os_image`.
+
+|`platform.powervs.defaultMachinePlatform`
+|The DefaultMachinePlatform is the default configuration used when installing on {ibmpowerProductName} Virtual Server for machine pools that do not define their own platform configuration.
+|String. For example, `existing_machine_platform`.
+
+|`platform.powervs.memoryGiB`
+|The size of a virtual machine's memory, in GB.
+|The valid integer must be an integer number of GB that is at least 2 and no more than 64, depending on the machine type.
+
+|`platform.powervs.procType`
+|The ProcType defines the processor sharing model for the instance.
+|The valid values are Capped, Dedicated, and Shared.
+
+|`platform.powervs.processors`
+|The Processors defines the processing units for the instance.
+|The number of processors must be from .5 to 32 cores. The processors must be in increments of .25.
+
+|`platform.powervs.sysType`
+|The SysType defines the system type for the instance.
+|The system type must be either `e980` or `s922`.
+endif::ibm-power-vs[]
 |====
 
 ifdef::aws[]
@@ -1396,97 +1458,6 @@ In either case, this resource group must only be used for a single cluster insta
 --
 endif::ibm-cloud[]
 
-ifdef::ibm-power-vs[]
-[id="installation-configuration-parameters-additional-ibm-cloud_{context}"]
-== Additional {ibmpowerProductName} Virtual Server configuration parameters
-
-Additional {ibmpowerProductName} Virtual Server configuration parameters are described in the following table. These parameters can be used for `compute` and `controlPlane`.
-
-.Additional {ibmpowerProductName} Virtual Server parameters
-[cols=".^1,.^6a,.^3a",options="header"]
-|====
-|Parameter|Description|Values
-
-|`platform.powervs.userID`
-|The UserID is the login for the user's IBM Cloud account.
-|String. For example `existing_user_id`.
-
-|`platform.powervs.powervsResourceGroup`
-|The PowerVSResourceGroup is the resource group in which {ibmpowerProductName} Virtual Server resources are created. If using an existing VPC, the existing VPC and subnets should be in this resource group.
-|String. For example `existing_resource_group`.
-
-|`platform.powervs.region`
-|Specifies the IBM Cloud colo region where the cluster will be created.
-|String. For example `existing_region`.
-
-|`platform.powervs.zone`
-|Specifies the IBM Cloud colo region where the cluster will be created.
-|String. For example `existing_zone`.
-
-|`platform.powervs.serviceInstanceID`
-|The ServiceInstanceID is the ID of the Power IAAS instance created from the IBM Cloud Catalog.
-|String. For example `existing_service_instance_ID`.
-
-|`platform.powervs.vpcRegion`
-|Specifies the IBM Cloud region in which to create VPC resources.
-|String. For example `existing_vpc_region`.
-
-|`platform.powervs.vpcSubnets`
-|Specifies existing subnets (by name) where cluster resources will be created.
-|String. For example `powervs_region_example_subnet`.
-
-|`platform.powervs.vpcName`
-|Specifies the IBM Cloud VPC name.
-|String. For example `existing_vpcName`.
-
-|`platform.powervs.cloudConnectionName`
-|The CloudConnctionName is the name of an existing PowerVS Cloud connection.
-|String. For example `existing_cloudConnectionName`.
-
-|`platform.powervs.clusterOSImage`
-|The ClusterOSImage is a pre-created {ibmpowerProductName} Virtual Server boot image that overrides the default image for cluster nodes.
-|String. For example `existing_cluster_os_image`.
-
-|`platform.powervs.defaultMachinePlatform`
-|The DefaultMachinePlatform is the default configuration used when installing on {ibmpowerProductName} Virtual Server for machine pools that do not define their own platform configuration.
-|String. For example `existing_machine_platform`.
-
-//|`platform.ibmcloud.dedicatedHosts.profile`
-//|The new dedicated host to create. If you specify a value for `platform.ibmcloud.dedicatedHosts.name`, this parameter is not required.
-//|Valid IBM Cloud VPC dedicated host profile, such as `cx2-host-152x304`. [^2^]
-
-//|`platform.ibmcloud.dedicatedHosts.name`
-//|An existing dedicated host. If you specify a value for `platform.ibmcloud.dedicatedHosts.profile`, this parameter is not required.
-//|String, for example `my-dedicated-host-name`.
-
-//|`platform.ibmcloud.type`
-//|The instance type for all IBM Cloud VPC machines.
-//|Valid IBM Cloud VPC instance type, such as `bx2-8x32`. [^2^]
-
-|`platform.powervs.memoryGiB`
-|The size of a virtual machine's memory, in GB.
-|The valid integer must be an integer number of GB that is at least 2 and no more than 64, depending on the machine type.
-
-|`platform.powervs.procType`
-|The ProcType defines the processor sharing model for the instance.
-|The valid values are Capped, Dedicated and Shared.
-
-|`platform.powervs.processors`
-|The Processors defines the processing units for the instance.
-|The number of processors must be from .5 to 32 cores. The processors must be in increments of .25.
-
-|`platform.powervs.sysType`
-|The SysType defines the system type for the instance.
-|The system type must be either `e980` or `s922`.
-
-|====
-[.small]
---
-1. Whether you define an existing resource group, or if the installer creates one, determines how the resource group is treated when the cluster is uninstalled. If you define a resource group, the installer removes all of the installer-provisioned resources, but leaves the resource group alone; if a resource group is created as part of the installation, the installer removes all of the installer provisioned resources and the resource group.
-2. To determine which profile best meets your needs, see https://cloud.ibm.com/docs/vpc?topic=vpc-profiles&interface=ui[Instance Profiles] in the IBM documentation.
---
-endif::ibm-power-vs[]
-
 ifdef::vsphere[]
 
 [id="installation-configuration-parameters-additional-vsphere_{context}"]

modules/installation-initializing.adoc

@@ -263,6 +263,15 @@ files that the installation program creates.
 When specifying the directory:
 * Verify that the directory has the `execute` permission. This permission is required to run Terraform binaries under the installation directory.
 * Use an empty directory. Some installation assets, such as bootstrap X.509 certificates, have short expiration intervals, therefore you must not reuse an installation directory. If you want to reuse individual files from another cluster installation, you can copy them into your directory. However, the file names for the installation assets might change between releases. Use caution when copying installation files from an earlier {product-title} version.
++
+[NOTE]
+=====
+Always delete the `~/.powervs` directory to avoid reusing a stale configuration. Run the following command:
+[source,terminal]
+----
+$ rm -rf ~/.powervs
+----
+=====
 .. At the prompts, provide the configuration details for your cloud:
 ... Optional: Select an SSH key to use to access your cluster machines.
 +