Revert ShouldBeAssigned to compare model type with IAAS;

sdg0919 · Oct 21, 2020 · ea0aafb · ea0aafb
1 parent efcf814
commit ea0aafb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/state/allwatcher.go b/state/allwatcher.go
@@ -555,7 +555,7 @@ func (u *backingUnit) updated(ctx *allWatcherContext) error {
 		info.CharmURL = u.CharmURL.String()
 	}
 
-	// Construct a unit for the purpose of retieving other fields as necessary.
+	// Construct a unit for the purpose of retrieving other fields as necessary.
 	modelType, err := ctx.modelType()
 	if err != nil {
 		return errors.Annotatef(err, "get model type for %q", ctx.modelUUID)

diff --git a/state/unit.go b/state/unit.go
@@ -129,7 +129,7 @@ func (u *Unit) ContainerInfo() (CloudContainer, error) {
 // ShouldBeAssigned returns whether the unit should be assigned to a machine.
 // IAAS models require units to be assigned.
 func (u *Unit) ShouldBeAssigned() bool {
-	return u.modelType != ModelTypeCAAS
+	return u.modelType == ModelTypeIAAS
 }
 
 // Application returns the application.