Issue #438: Move fillClusterConfig() after VM loading/creation

This is in preparation for the next commits, so that we can have
different bundle info metadata depending on load/create

This is related to #438

Author: cfergeau

pkg/crc/machine/machine.go

@@ -71,12 +71,6 @@ func Start(startConfig StartConfig) (StartResult, error) {
 		return *result, errors.Newf("Error to get bundle Metadata %v", err)
 	}
 
-	err = fillClusterConfig(crcBundleMetadata, &result.ClusterConfig)
-	if err != nil {
-		result.Error = err.Error()
-		return *result, errors.Newf("%s", err.Error())
-	}
-
 	// Pre-VM start
 	driverInfo, _ := getDriverInfo(startConfig.VMDriver)
 	exists, err := existVM(libMachineAPIClient, startConfig.Name)
@@ -156,6 +150,12 @@ func Start(startConfig StartConfig) (StartResult, error) {
 		result.Status = vmState.String()
 	}
 
+	err = fillClusterConfig(crcBundleMetadata, &result.ClusterConfig)
+	if err != nil {
+		result.Error = err.Error()
+		return *result, errors.Newf("%s", err.Error())
+	}
+
 	// Post-VM start
 	host, err := libMachineAPIClient.Load(startConfig.Name)
 	if err != nil {