5 files changed, 32 insertions, 5 deletions
diff --git a/cmd/podman/common/completion.go b/cmd/podman/common/completion.go
index 83fe0723c..d01842998 100644
--- a/cmd/podman/common/completion.go
+++ b/cmd/podman/common/completion.go
@@ -982,9 +982,10 @@ func AutocompletePsFilters(cmd *cobra.Command, args []string, toComplete string)
 			return []string{define.HealthCheckHealthy,
 				define.HealthCheckUnhealthy}, cobra.ShellCompDirectiveNoFileComp
 		},
-		"label=":  nil,
-		"exited=": nil,
-		"until=":  nil,
+		"network=": func(s string) ([]string, cobra.ShellCompDirective) { return getNetworks(cmd, s) },
+		"label=":   nil,
+		"exited=":  nil,
+		"until=":   nil,
 	}
 	return completeKeyValues(toComplete, kv)
 }
@@ -1004,7 +1005,8 @@ func AutocompletePodPsFilters(cmd *cobra.Command, args []string, toComplete stri
 		"ctr-status=": func(_ string) ([]string, cobra.ShellCompDirective) {
 			return containerStatuses, cobra.ShellCompDirectiveNoFileComp
 		},
-		"label=": nil,
+		"network=": func(s string) ([]string, cobra.ShellCompDirective) { return getNetworks(cmd, s) },
+		"label=":   nil,
 	}
 	return completeKeyValues(toComplete, kv)
 }
diff --git a/cmd/podman/containers/ps.go b/cmd/podman/containers/ps.go
index 5d08e6163..d23771fc5 100644
--- a/cmd/podman/containers/ps.go
+++ b/cmd/podman/containers/ps.go
@@ -392,6 +392,11 @@ func (l psReporter) Names() string {
 	return l.ListContainer.Names[0]
 }
 
+// Networks returns the container network names in string format
+func (l psReporter) Networks() string {
+	return strings.Join(l.ListContainer.Networks, ",")
+}
+
 // Ports converts from Portmappings to the string form
 // required by ps
 func (l psReporter) Ports() string {
diff --git a/cmd/podman/play/kube.go b/cmd/podman/play/kube.go
index db7280b1d..1f54db203 100644
--- a/cmd/podman/play/kube.go
+++ b/cmd/podman/play/kube.go
@@ -12,6 +12,7 @@ import (
 	"github.com/containers/podman/v2/cmd/podman/utils"
 	"github.com/containers/podman/v2/pkg/domain/entities"
 	"github.com/containers/podman/v2/pkg/util"
+	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
@@ -130,6 +131,8 @@ func kube(cmd *cobra.Command, args []string) error {
 		}
 	}
 
+	ctrsFailed := 0
+
 	for _, pod := range report.Pods {
 		fmt.Printf("Pod:\n")
 		fmt.Println(pod.ID)
@@ -145,9 +148,21 @@ func kube(cmd *cobra.Command, args []string) error {
 		for _, ctr := range pod.Containers {
 			fmt.Println(ctr)
 		}
+		ctrsFailed += len(pod.ContainerErrors)
+		// If We have errors, add a newline
+		if len(pod.ContainerErrors) > 0 {
+			fmt.Println()
+		}
+		for _, err := range pod.ContainerErrors {
+			fmt.Fprintf(os.Stderr, err+"\n")
+		}
 		// Empty line for space for next block
 		fmt.Println()
 	}
 
+	if ctrsFailed > 0 {
+		return errors.Errorf("failed to start %d containers", ctrsFailed)
+	}
+
 	return nil
 }
diff --git a/cmd/podman/pods/ps.go b/cmd/podman/pods/ps.go
index 99d324411..a27ab4859 100644
--- a/cmd/podman/pods/ps.go
+++ b/cmd/podman/pods/ps.go
@@ -191,6 +191,11 @@ func (l ListPodReporter) Labels() map[string]string {
 	return l.ListPodsReport.Labels
 }
 
+// Networks returns the infra container network names in string format
+func (l ListPodReporter) Networks() string {
+	return strings.Join(l.ListPodsReport.Networks, ",")
+}
+
 // NumberOfContainers returns an int representation for
 // the number of containers belonging to the pod
 func (l ListPodReporter) NumberOfContainers() int {
diff --git a/cmd/podman/root.go b/cmd/podman/root.go
index 1f613a4c5..0ee530242 100644
--- a/cmd/podman/root.go
+++ b/cmd/podman/root.go
@@ -158,7 +158,7 @@ func persistentPreRunE(cmd *cobra.Command, args []string) error {
 
 	// Prep the engines
 	if _, err := registry.NewImageEngine(cmd, args); err != nil {
-		return err
+		return errors.Wrapf(err, "Cannot connect to the Podman socket, make sure there is a Podman REST API service running.")
 	}
 	if _, err := registry.NewContainerEngine(cmd, args); err != nil {
 		return err