Skip to content

Commit

Permalink
lrp should use chassis name instead of uuid (#3258)
Browse files Browse the repository at this point in the history
Signed-off-by: bobz965 <[email protected]>
  • Loading branch information
bobz965 committed Sep 26, 2023
1 parent e945a10 commit 1156c03
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pkg/controller/external-gw.go
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ func (c *Controller) getGatewayChassis(config map[string]string) ([]string, erro
klog.Errorf("failed to get node %s chassis: %s, %v", node.Name, annoChassisName, err)
return chassises, err
}
chassises = append(chassises, chassis.UUID)
chassises = append(chassises, chassis.Name)
}
if len(chassises) == 0 {
klog.Error("no available external gw")
Expand Down
4 changes: 2 additions & 2 deletions pkg/ovs/ovn-sb-chassis.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ func (c *OVNSbClient) DeleteChassis(chassisName string) error {
}
ops, err := c.ovsDbClient.Where(chassis).Delete()
if err != nil {
return fmt.Errorf("failed to generate delete operations for chassis %s: %v", chassis.UUID, err)
return fmt.Errorf("failed to generate delete chassis operations for node %s: %v", chassis.Hostname, err)
}
if err = c.Transact("chassis-del", ops); err != nil {
return fmt.Errorf("failed to delete chassis with with UUID %s: %v", chassis.UUID, err)
return fmt.Errorf("failed to delete chassis for node %s: %v", chassis.Hostname, err)
}
return nil
}
Expand Down

0 comments on commit 1156c03

Please sign in to comment.