Merge pull request openshift#14746 from kalexand-rh/BZ1706126

bug 1706126 adjusting worker output and sample yamls

modules/installation-bare-metal-config-yaml.adoc

@@ -18,31 +18,35 @@ compute:
   replicas: 0 <2>
 controlPlane:
   name: master
-  replicas: 3
+  replicas: 3 <3>
 metadata:
-  name: test <3>
+  name: test <4>
 networking:
   clusterNetworks:
-  - cidr: 10.128.0.0/14 <4>
-    hostPrefix: 23 <5>
+  - cidr: 10.128.0.0/14 <5>
+    hostPrefix: 23 <6>
   networkType: OpenShiftSDN
-  serviceNetwork: <6>
+  serviceNetwork: <7>
   - 172.30.0.0/16
 platform:
   none: {}
-pullSecret: '{"auths": ...}' <7>
-sshKey: 'ssh-ed25519 AAAA...' <8>
+pullSecret: '{"auths": ...}' <8>
+sshKey: 'ssh-ed25519 AAAA...' <9>
 ----
 <1> The base domain of the cluster. All DNS records must be sub-domains of this
 base and include the cluster name.
-<2> You must set the number of workers to `0`.
-<3> The cluster name.
-<4> A block of IP addresses from which pod IPs are allocated.
-<5> The subnet prefix length to assign to each individual node. For example, if
+<2> You must set the number of workers to `0` in this file. Remember that you
+must manually deploy at least one compute, or worker, machine in the cluster.
+<3> The number of control plane machines that you add to the cluster. Because
+the cluster uses this values as the number of etcd endpoints in the cluster, the
+value must match the number of control plane machines that you deploy.
+<4> The cluster name.
+<5> A block of IP addresses from which pod IPs are allocated.
+<6> The subnet prefix length to assign to each individual node. For example, if
 `hostPrefix` is set to `23`, then each node is assigned a `/23` subnet out of
 the given `cidr`, which allows for 510 (2^(32 - 23) - 2) pod IPs addresses.
-<6> The IP address pool to use for service IP addresses. You can enter only
+<7> The IP address pool to use for service IP addresses. You can enter only
 one IP address pool.
-<7> The pull secret that provides components in the cluster access to images for
+<8> The pull secret that provides components in the cluster access to images for
 {product-title} components.
-<8> The default SSH key for the `core` user.
+<9> The default SSH key for the `core` user.

modules/installation-installing-bare-metal.adoc

@@ -51,8 +51,6 @@ master-0  NotReady  master  50s  v1.12.4+c53f462
 master-1  NotReady  master  63s  v1.12.4+c53f462
 master-2  NotReady  master  64s  v1.12.4+c53f462
 worker-0  NotReady  worker  76s  v1.12.4+c53f462
-worker-1  NotReady  worker  70s  v1.12.4+c53f462
-worker-2  NotReady  worker  69s   v1.12.4+c53f462
 ----
 +
 The output lists all of the machines that you created.

modules/installation-vsphere-config-yaml.adoc

@@ -15,30 +15,33 @@ apiVersion: v1
 baseDomain: example.com <1>
 controlPlane:
   name: master
-  replicas: 3
+  replicas: 3 <2>
 metadata:
-  name: test <2>
+  name: test <3>
 platform:
   vsphere:
-    vcenter: your.vcenter.server <3>
-    username: username <4>
-    password: password <5>
-    datacenter: datacenter <6>
-    defaultDatastore: datastore <7>
-pullSecret: '{"auths": ...}' <8>
-sshKey: 'ssh-ed25519 AAAA...' <9>
+    vcenter: your.vcenter.server <4>
+    username: username <5>
+    password: password <6>
+    datacenter: datacenter <7>
+    defaultDatastore: datastore <8>
+pullSecret: '{"auths": ...}' <9>
+sshKey: 'ssh-ed25519 AAAA...' <10>
 
 ----
 <1> The base domain of the cluster. All DNS records must be sub-domains of this
 base and include the cluster name.
-<2> The cluster name.
-<3> The fully-qualified host name or IP address of the vCenter server.
-<4> The name of the user for accessing the server. This user must have at least
+<2> The number of control plane machines that you add to the cluster. Because
+the cluster uses this values as the number of etcd endpoints in the cluster, the
+value must match the number of control plane machines that you deploy.
+<3> The cluster name.
+<4> The fully-qualified host name or IP address of the vCenter server.
+<5> The name of the user for accessing the server. This user must have at least
 the roles and privileges that are required for
 link:https://vmware.github.io/vsphere-storage-for-kubernetes/documentation/vcp-roles.html[dynamic persistent volume provisioning]
 in vSphere.
-<5> The password associated with the vSphere user.
-<6> The vSphere datacenter.
-<7> The default vSphere datastore to use.
-<8> The pull secret that provides components in the cluster access to images for {product-title} components.
+<6> The password associated with the vSphere user.
+<7> The vSphere datacenter.
+<8> The default vSphere datastore to use.
+<9> The pull secret that provides components in the cluster access to images for {product-title} components.
 <9> The default SSH key for the `core` user in {op-system-first}.