From 34d1398e9231553b2f934d86a71b40e8a0c2782e Mon Sep 17 00:00:00 2001
From: Kostiantyn Kalynovskyi <kkalinovskiy@gmail.com>
Date: Sat, 12 Jun 2021 04:38:17 +0000
Subject: [PATCH] Correct node count and dont fail on network plugin

Change-Id: I012b3509eafc69e6f1e16b4d7e5c9e58596b5c37
---
 pkg/managers/bmh.go                                       | 8 ++++----
 .../playbooks/roles/libvirt/tasks/create-network.yaml     | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkg/managers/bmh.go b/pkg/managers/bmh.go
index ca26f62..d5e7b51 100644
--- a/pkg/managers/bmh.go
+++ b/pkg/managers/bmh.go
@@ -141,7 +141,7 @@ func (r *BMHManager) requestVMs(ctx context.Context) error {
 	}
 
 	r.Logger.Info("Vino daemonset pod count", "count", len(podList.Items))
-
+	physicalNodeCount := len(podList.Items)
 	for _, pod := range podList.Items {
 		r.Logger.Info("Creating baremetal hosts for pod",
 			"pod name",
@@ -151,7 +151,7 @@ func (r *BMHManager) requestVMs(ctx context.Context) error {
 		if err != nil {
 			return err
 		}
-		err = r.setBMHs(ctx, pod)
+		err = r.setBMHs(ctx, pod, physicalNodeCount)
 		if err != nil {
 			return err
 		}
@@ -182,7 +182,7 @@ func (r *BMHManager) createIpamNetwork(ctx context.Context, network vinov1.Netwo
 	return r.Ipam.AddSubnetRange(ctx, network.SubNet, subnetRange, macPrefix)
 }
 
-func (r *BMHManager) setBMHs(ctx context.Context, pod corev1.Pod) error {
+func (r *BMHManager) setBMHs(ctx context.Context, pod corev1.Pod, nodeCount int) error {
 	domains := []vinov1.BuilderDomain{}
 
 	k8sNode, err := r.getNode(ctx, pod)
@@ -265,7 +265,7 @@ func (r *BMHManager) setBMHs(ctx context.Context, pod corev1.Pod) error {
 		Networks:             r.ViNO.Spec.Networks,
 		CPUConfiguration:     r.ViNO.Spec.CPUConfiguration,
 		Domains:              domains,
-		NodeCount:            len(r.ViNO.Spec.Nodes),
+		NodeCount:            nodeCount,
 	}
 	return r.annotateNode(ctx, k8sNode, vinoBuilder)
 }
diff --git a/vino-builder/assets/playbooks/roles/libvirt/tasks/create-network.yaml b/vino-builder/assets/playbooks/roles/libvirt/tasks/create-network.yaml
index 0213564..dd1821c 100644
--- a/vino-builder/assets/playbooks/roles/libvirt/tasks/create-network.yaml
+++ b/vino-builder/assets/playbooks/roles/libvirt/tasks/create-network.yaml
@@ -39,3 +39,4 @@
   shell: |
     brctl addif vm-infra-bridge "{{ network.physicalInterface }}"
   when: "network.physicalInterface is defined"
+  ignore_errors: True