Merge pull request #606 from cgalibern/feature-podman

feature-podman

core/driverdb/drivers_linux.go

@@ -11,8 +11,10 @@ import (
 	_ "github.com/opensvc/om3/drivers/poolloop"
 	_ "github.com/opensvc/om3/drivers/poolvg"
 	_ "github.com/opensvc/om3/drivers/rescontainerdocker"
+	_ "github.com/opensvc/om3/drivers/rescontainerdockercli"
 	_ "github.com/opensvc/om3/drivers/rescontainerkvm"
 	_ "github.com/opensvc/om3/drivers/rescontainerlxc"
+	_ "github.com/opensvc/om3/drivers/rescontainerpodman"
 	_ "github.com/opensvc/om3/drivers/rescontainervbox"
 	_ "github.com/opensvc/om3/drivers/resdiskcrypt"
 	_ "github.com/opensvc/om3/drivers/resdiskdrbd"

core/nodeaction/node.go

@@ -13,6 +13,8 @@ import (
 	"sigs.k8s.io/yaml"
 
 	"github.com/google/uuid"
+	"github.com/rs/zerolog/log"
+
 	"github.com/opensvc/om3/core/actionrouter"
 	"github.com/opensvc/om3/core/client"
 	"github.com/opensvc/om3/core/event"
@@ -27,7 +29,6 @@ import (
 	"github.com/opensvc/om3/util/plog"
 	"github.com/opensvc/om3/util/pubsub"
 	"github.com/opensvc/om3/util/xsession"
-	"github.com/rs/zerolog/log"
 )
 
 type (

core/object/core_action.go

@@ -285,11 +285,12 @@ func (t *actor) action(ctx context.Context, fn resourceset.DoFunc) error {
 		Attr("argv", os.Args).
 		Attr("cwd", wd).
 		Attr("action", action.Name).
-		Attr("origin", env.Origin())
-	logger.Infof("do %s (origin %s)", os.Args, env.Origin())
+		Attr("origin", env.Origin()).
+		Attr("crm", "true")
+	logger.Infof("do %s %s (origin %s)", action.Name, os.Args, env.Origin())
 	beginTime := time.Now()
 	defer func() {
-		logger.Attr("duration", time.Now().Sub(beginTime)).Infof("done %s in %s", os.Args, time.Now().Sub(beginTime))
+		logger.Attr("duration", time.Now().Sub(beginTime)).Infof("done %s %s in %s", action.Name, os.Args, time.Now().Sub(beginTime))
 	}()
 
 	// daemon instance monitor updates