Merge pull request #1094 from jlebon/pr/openstack-neednet

fetch-offline: immediately return ErrNeedNet on OpenStack
coreos · Sep 16, 2020 · f05bc76 · f05bc76
2 parents 4d7f5fb + 2e2e285
commit f05bc76
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 20 deletions.
diff --git a/internal/providers/cloudstack/cloudstack.go b/internal/providers/cloudstack/cloudstack.go
@@ -47,21 +47,23 @@ const (
 )
 
 func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) {
+	// The fetch-offline approach doesn't work well here because of the "split
+	// personality" of this provider. See:
+	// https://github.com/coreos/ignition/issues/1081
+	if f.Offline {
+		return types.Config{}, report.Report{}, resource.ErrNeedNet
+	}
+
 	var data []byte
 	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 
-	sawErrNeedNet := false
-
 	dispatch := func(name string, fn func() ([]byte, error)) {
 		raw, err := fn()
 		if err != nil {
 			switch err {
 			case context.Canceled:
 			case context.DeadlineExceeded:
 				f.Logger.Err("timed out while fetching config from %s", name)
-			case resource.ErrNeedNet:
-				sawErrNeedNet = true
-				fallthrough
 			default:
 				f.Logger.Err("failed to fetch config from %s: %v", name, err)
 			}
@@ -86,11 +88,6 @@ func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) {
 
 	<-ctx.Done()
 	if ctx.Err() == context.DeadlineExceeded {
-		// Did we hit neednet? If so, propagate that up instead. The OS should
-		// retry fetching again once networking is up.
-		if sawErrNeedNet {
-			return types.Config{}, report.Report{}, resource.ErrNeedNet
-		}
 		f.Logger.Info("neither config drive nor metadata service were available in time. Continuing without a config...")
 	}
 

diff --git a/internal/providers/openstack/openstack.go b/internal/providers/openstack/openstack.go
@@ -52,21 +52,23 @@ var (
 )
 
 func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) {
+	// The fetch-offline approach doesn't work well here because of the "split
+	// personality" of this provider. See:
+	// https://github.com/coreos/ignition/issues/1081
+	if f.Offline {
+		return types.Config{}, report.Report{}, resource.ErrNeedNet
+	}
+
 	var data []byte
 	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 
-	sawErrNeedNet := false
-
 	dispatch := func(name string, fn func() ([]byte, error)) {
 		raw, err := fn()
 		if err != nil {
 			switch err {
 			case context.Canceled:
 			case context.DeadlineExceeded:
 				f.Logger.Err("timed out while fetching config from %s", name)
-			case resource.ErrNeedNet:
-				sawErrNeedNet = true
-				fallthrough
 			default:
 				f.Logger.Err("failed to fetch config from %s: %v", name, err)
 			}
@@ -91,11 +93,6 @@ func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) {
 
 	<-ctx.Done()
 	if ctx.Err() == context.DeadlineExceeded {
-		// Did we hit neednet? If so, propagate that up instead. The OS should
-		// retry fetching again once networking is up.
-		if sawErrNeedNet {
-			return types.Config{}, report.Report{}, resource.ErrNeedNet
-		}
 		f.Logger.Info("neither config drive nor metadata service were available in time. Continuing without a config...")
 	}