Merge pull request openshift#8316 from honza/master-count-template

OCPBUGS-32981: baremetal: template the number of master nodes

Author: openshift-merge-bot[bot]

…files/usr/local/bin/master-bmh-update.sh …/local/bin/master-bmh-update.sh.templatedata/data/bootstrap/baremetal/files/usr/local/bin/master-bmh-update.sh renamed to data/data/bootstrap/baremetal/files/usr/local/bin/master-bmh-update.sh.template data/data/bootstrap/baremetal/files/usr/local/bin/master-bmh-update.sh renamed to data/data/bootstrap/baremetal/files/usr/local/bin/master-bmh-update.sh.template

@@ -10,12 +10,7 @@ until oc get baremetalhosts -n openshift-machine-api; do
    sleep 20
 done
 
-N="0"
-while [ "$N" -eq "0" ] ; do
-    echo "Waiting for control-plane bmh to appear..."
-    sleep 20
-    N=$(oc get bmh -n openshift-machine-api -l installer.openshift.io/role=control-plane --no-headers=true | wc -l)
-done
+N="{{ .PlatformData.BareMetal.MasterHostCount }}"
 echo "Waiting for $N masters to become provisioned"
 while [ "$(oc get bmh -n openshift-machine-api -l installer.openshift.io/role=control-plane -o json | jq '.items[].status.provisioning.state' | grep provisioned -c)" -lt "$N"  ]; do
     echo "Waiting for $N masters to become provisioned"

pkg/asset/ignition/bootstrap/baremetal/template.go

@@ -58,6 +58,9 @@ type TemplateData struct {
 	// Hosts is the information needed to create the objects in Ironic.
 	Hosts []*baremetal.Host
 
+	// How many of the Hosts are control plane machines?
+	MasterHostCount int
+
 	// ProvisioningNetwork displays the type of provisioning network being used
 	ProvisioningNetwork string
 
@@ -100,6 +103,12 @@ func GetTemplateData(config *baremetal.Platform, networks []types.MachineNetwork
 
 	templateData.Hosts = config.Hosts
 
+	for _, host := range config.Hosts {
+		if host.IsMaster() {
+			templateData.MasterHostCount++
+		}
+	}
+
 	templateData.ProvisioningIP = config.BootstrapProvisioningIP
 	templateData.ProvisioningNetwork = string(config.ProvisioningNetwork)
 	templateData.ExternalStaticIP = config.BootstrapExternalStaticIP