airship
/
vino
Code Issues Proposed changes

Merge "Correct node count and dont fail on network plugin"

This commit is contained in:
Zuul 2021-06-12 19:00:56 +00:00 committed by Gerrit Code Review
parent cd12302482 34d1398e92
commit 0e709c0d27
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/managers/bmh.go
View File

@ -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)
@ -267,7 +267,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)
}

1
vino-builder/assets/playbooks/roles/libvirt/tasks/create-network.yaml
View File

@ -39,3 +39,4 @@
shell: |
brctl addif vm-infra-bridge "{{ network.physicalInterface }}"
when: "network.physicalInterface is defined"
ignore_errors: True