Merge pull request #49 from dhellmann/update-bmo-20200218

Bug 1804408: update vendored copy of baremetal-operator
openshift · Feb 18, 2020 · 4d1663e · 4d1663e
2 parents a2a4779 + 716e448
commit 4d1663e
Show file tree

Hide file tree

Showing 51 changed files with 2,545 additions and 1,474 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/pkg/cloud/baremetal/actuators/machine/actuator.go b/pkg/cloud/baremetal/actuators/machine/actuator.go
@@ -166,7 +166,7 @@ func (a *Actuator) Delete(ctx context.Context, cluster *clusterv1.Cluster, machi
 		switch host.Status.Provisioning.State {
 		case bmh.StateRegistrationError, bmh.StateRegistering,
 			bmh.StateMatchProfile, bmh.StateInspecting,
-			bmh.StateReady, bmh.StateValidationError:
+			bmh.StateReady, bmh.StateProvisioningError:
 			// Host is not provisioned
 			waiting = false
 		case bmh.StateExternallyProvisioned:

diff --git a/vendor/github.com/metal3-io/baremetal-operator/.travis.yml b/vendor/github.com/metal3-io/baremetal-operator/.travis.yml