Enable multiple non-IP interface to be connected via tc redirect

cmd/ignite-spawn/ignite-spawn.go

@@ -39,8 +39,9 @@ func decodeVM(vmID string) (*api.VM, error) {
 }
 
 func StartVM(vm *api.VM) (err error) {
+
 	// Setup networking inside of the container, return the available interfaces
-	dhcpIfaces, err := container.SetupContainerNetworking()
+	fcIfaces, dhcpIfaces, err := container.SetupContainerNetworking(vm)
 	if err != nil {
 		return fmt.Errorf("network setup failed: %v", err)
 	}
@@ -66,7 +67,7 @@ func StartVM(vm *api.VM) (err error) {
 	defer util.DeferErr(&err, func() error { return os.Remove(metricsSocket) })
 
 	// Execute Firecracker
-	if err = container.ExecuteFirecracker(vm, dhcpIfaces); err != nil {
+	if err = container.ExecuteFirecracker(vm, fcIfaces); err != nil {
 		return fmt.Errorf("runtime error for VM %q: %v", vm.GetUID(), err)
 	}
 

cmd/ignite/cmd/cmdutil/flags.go

@@ -27,6 +27,10 @@ func AddInteractiveFlag(fs *pflag.FlagSet, interactive *bool) {
 	fs.BoolVarP(interactive, "interactive", "i", *interactive, "Attach to the VM after starting")
 }
 
+func AddWaitFlag(fs *pflag.FlagSet, wait *bool) {
+	fs.BoolVarP(wait, "wait", "w", true, "wait for VM to start")
+}
+
 func AddForceFlag(fs *pflag.FlagSet, force *bool) {
 	fs.BoolVarP(force, "force", "f", *force, "Force this operation. Warning, use of this mode may have unintended consequences.")
 }

cmd/ignite/cmd/vmcmd/start.go

@@ -51,6 +51,7 @@ func NewCmdStart(out io.Writer) *cobra.Command {
 
 func addStartFlags(fs *pflag.FlagSet, sf *run.StartFlags) {
 	cmdutil.AddInteractiveFlag(fs, &sf.Interactive)
+	cmdutil.AddWaitFlag(fs, &sf.Wait)
 	fs.BoolVarP(&sf.Debug, "debug", "d", false, "Debug mode, keep container after VM shutdown")
 	fs.StringSliceVar(&sf.IgnoredPreflightErrors, "ignore-preflight-checks", []string{}, "A list of checks whose errors will be shown as warnings. Example: 'BinaryInPath,Port,ExistingFile'. Value 'all' ignores errors from all checks.")
 }

cmd/ignite/run/exec.go

@@ -2,6 +2,7 @@ package run
 
 import (
 	api "github.com/weaveworks/ignite/pkg/apis/ignite"
+	"github.com/weaveworks/ignite/pkg/constants"
 )
 
 // ExecFlags contains the flags supported by the exec command.
@@ -30,5 +31,8 @@ func (ef *ExecFlags) NewExecOptions(vmMatch string, command ...string) (eo *Exec
 
 // Exec executes command in a VM based on the provided ExecOptions.
 func Exec(eo *ExecOptions) error {
+	if err := waitForSSH(eo.vm, constants.SSH_DEFAULT_TIMEOUT_SECONDS, 5); err != nil {
+		return err
+	}
 	return runSSH(eo.vm, eo.IdentityFile, eo.command, eo.Tty, eo.Timeout)
 }

cmd/ignite/run/start.go

@@ -22,6 +22,7 @@ import (
 
 type StartFlags struct {
 	Interactive            bool
+	Wait                   bool
 	Debug                  bool
 	IgnoredPreflightErrors []string
 }
@@ -78,12 +79,20 @@ func Start(so *StartOptions, fs *flag.FlagSet) error {
 		return err
 	}
 
-	if err := operations.StartVM(so.vm, so.Debug); err != nil {
+	var err error
+	if so.Wait {
+		err = operations.StartVM(so.vm, so.Debug)
+	} else {
+		// Can't do much with vmChannels here, we need to return ASAP
+		_, err = operations.StartVMNonBlocking(so.vm, so.Debug)
+	}
+
+	if err != nil {
 		return err
 	}
 
 	// When --ssh is enabled, wait until SSH service started on port 22 at most N seconds
-	if ssh := so.vm.Spec.SSH; ssh != nil && ssh.Generate && len(so.vm.Status.Network.IPAddresses) > 0 {
+	if ssh := so.vm.Spec.SSH; ssh != nil && ssh.Generate && len(so.vm.Status.Network.IPAddresses) > 0 && so.Wait {
 		if err := waitForSSH(so.vm, constants.SSH_DEFAULT_TIMEOUT_SECONDS, 5); err != nil {
 			return err
 		}

docs/cli/ignite/ignite_run.md

@@ -48,6 +48,7 @@ ignite run <OCI image> [flags]
   -s, --size size                         VM filesystem size, for example 5GB or 2048MB (default 4.0 GB)
       --ssh[=<path>]                      Enable SSH for the VM. If <path> is given, it will be imported as the public key. If just '--ssh' is specified, a new keypair will be generated. (default is unset, which disables SSH access to the VM)
   -v, --volumes volume                    Expose block devices from the host inside the VM
+  -w, --wait                              wait for VM to start (default true)
 ```
 
 ### Options inherited from parent commands

docs/cli/ignite/ignite_start.md

@@ -23,6 +23,7 @@ ignite start <vm> [flags]
   -i, --interactive                       Attach to the VM after starting
       --network-plugin plugin             Network plugin to use. Available options are: [cni docker-bridge] (default cni)
       --runtime runtime                   Container runtime to use. Available options are: [docker containerd] (default containerd)
+  -w, --wait                              wait for VM to start (default true)
 ```
 
 ### Options inherited from parent commands

docs/cli/ignite/ignite_vm_run.md

@@ -48,6 +48,7 @@ ignite vm run <OCI image> [flags]
   -s, --size size                         VM filesystem size, for example 5GB or 2048MB (default 4.0 GB)
       --ssh[=<path>]                      Enable SSH for the VM. If <path> is given, it will be imported as the public key. If just '--ssh' is specified, a new keypair will be generated. (default is unset, which disables SSH access to the VM)
   -v, --volumes volume                    Expose block devices from the host inside the VM
+  -w, --wait                              wait for VM to start (default true)
 ```
 
 ### Options inherited from parent commands

docs/cli/ignite/ignite_vm_start.md

@@ -23,6 +23,7 @@ ignite vm start <vm> [flags]
   -i, --interactive                       Attach to the VM after starting
       --network-plugin plugin             Network plugin to use. Available options are: [cni docker-bridge] (default cni)
       --runtime runtime                   Container runtime to use. Available options are: [docker containerd] (default containerd)
+  -w, --wait                              wait for VM to start (default true)
 ```
 
 ### Options inherited from parent commands