Skip to content

Commit

Permalink
Merge pull request #12 in HMS/hms-bss from bugfix/CASMHMS-4546-docs-w…
Browse files Browse the repository at this point in the history
…ar-bss-ethernet-interface-cache-issue-with-m001-reboot to release/csm-1.0

* commit '336e7a69aca265502103fe77242445bd21db8180':
  Version bump.
  Removed blank IP from preventing BSS from recording an EthernetInterface defined MAC in its list of MACs for a node.
  • Loading branch information
Dennis Walker committed Apr 15, 2021
2 parents 37a0d76 + 336e7a6 commit 566edb0
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.7.4
1.7.5
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.7.5] - 2021-04-15

## Changed

- Removed blank IP from preventing BSS from recording an EthernetInterface defined MAC in its list of MACs for a node.

## [1.7.4] - 2021-04-06

## Changed
Expand Down
12 changes: 6 additions & 6 deletions cmd/boot-script-service/sm.go
Original file line number Diff line number Diff line change
Expand Up @@ -290,14 +290,14 @@ func getStateFromHSM() *SMData {
debugf("EthInterface: %v\n", e)
if e.IPAddr != "" {
addresses[e.IPAddr] = e
}

// Also see if this EthernetInterface belongs to any Components.
for index, _ := range comps.Components {
component := comps.Components[index]
// Also see if this EthernetInterface belongs to any Components.
for index, _ := range comps.Components {
component := comps.Components[index]

if component.ID == e.CompID {
comps.Components[index].Mac = append(comps.Components[index].Mac, ensureLegalMAC(e.MACAddr))
}
if component.ID == e.CompID {
comps.Components[index].Mac = append(comps.Components[index].Mac, ensureLegalMAC(e.MACAddr))
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/cray-hms-bss/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ apiVersion: v1
description: "Kubernetes resources for cray-hms-bss"
name: "cray-hms-bss"
home: "HMS/hms-bss"
version: 1.7.4
version: 1.7.5

0 comments on commit 566edb0

Please sign in to comment.