Skip to content

Commit

Permalink
fix: don't automatically use GRE mesh when bridge name isn't phenix
Browse files Browse the repository at this point in the history
Commit 7b80f40 incorrectly assumed users would always want to use the
GRE mesh namespace bridge capability in minimega when the default bridge
for an experiment was not `phenix` (the default).
  • Loading branch information
activeshadow committed Aug 16, 2024
1 parent a59f0ae commit 0264514
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile.minimega
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
ARG MM_REV
FROM ghcr.io/activeshadow/minimega/minimega:${MM_REV}

ARG MINIMEGA_REVISION
ARG MM_REV
LABEL org.opencontainers.image.base.name="ghcr.io/activeshadow/minimega/minimega:${MM_REV}"
ARG PHENIX_REVISION=local-dev
LABEL gov.sandia.phenix.revision="${PHENIX_REVISION}"
Expand Down
2 changes: 1 addition & 1 deletion src/go/api/experiment/experiment.go
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ func Start(ctx context.Context, opts ...StartOption) error {
// them. This cannot be done as part of the minimega script template since
// the VM taps (and thus bridges) do not get created until the overall
// minimega namespace is launched.
if exp.Spec.UseGREMesh() || exp.Spec.DefaultBridge() != "phenix" {
if exp.Spec.UseGREMesh() {
if err := mm.CreateBridge(mm.NS(exp.Metadata.Name), mm.Bridge(exp.Spec.DefaultBridge())); err != nil {
if !o.mmErrAsWarn {
mm.ClearNamespace(exp.Spec.ExperimentName())
Expand Down

0 comments on commit 0264514

Please sign in to comment.