Param --units_directory to customise the units directory

coreos · Mar 22, 2016 · fd10199 · fd10199
1 parent d98fc61
commit fd10199
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/config/config.go b/config/config.go
@@ -34,6 +34,7 @@ type Config struct {
 	DisableEngine           bool
 	DisableWatches          bool
 	VerifyUnits             bool
+	UnitsDirectory          string
 	AuthorizedKeysFile      string
 }
 

diff --git a/fleetd/fleetd.go b/fleetd/fleetd.go
@@ -86,6 +86,7 @@ func main() {
 	cfgset.String("public_ip", "", "IP address that fleet machine should publish")
 	cfgset.String("metadata", "", "List of key-value metadata to assign to the fleet machine")
 	cfgset.String("agent_ttl", agent.DefaultTTL, "TTL in seconds of fleet machine state in etcd")
+	cfgset.String("units_directory", "/run/fleet/units/", "Path to the fleet units directory")
 	cfgset.Int("token_limit", 100, "Maximum number of entries per page returned from API requests")
 	cfgset.Bool("disable_engine", false, "Disable the engine entirely, use with care")
 	cfgset.Bool("disable_watches", false, "Disable the use of etcd watches. Increases scheduling latency")
@@ -216,6 +217,7 @@ func getConfig(flagset *flag.FlagSet, userCfgFile string) (*config.Config, error
 		DisableEngine:           (*flagset.Lookup("disable_engine")).Value.(flag.Getter).Get().(bool),
 		DisableWatches:          (*flagset.Lookup("disable_watches")).Value.(flag.Getter).Get().(bool),
 		VerifyUnits:             (*flagset.Lookup("verify_units")).Value.(flag.Getter).Get().(bool),
+		UnitsDirectory:          (*flagset.Lookup("units_directory")).Value.(flag.Getter).Get().(string),
 		TokenLimit:              (*flagset.Lookup("token_limit")).Value.(flag.Getter).Get().(int),
 		AuthorizedKeysFile:      (*flagset.Lookup("authorized_keys_file")).Value.(flag.Getter).Get().(string),
 	}

diff --git a/server/server.go b/server/server.go
@@ -72,7 +72,7 @@ func New(cfg config.Config) (*Server, error) {
 		return nil, err
 	}
 
-	mgr, err := systemd.NewSystemdUnitManager(systemd.DefaultUnitsDirectory)
+	mgr, err := systemd.NewSystemdUnitManager(cfg.UnitsDirectory)
 	if err != nil {
 		return nil, err
 	}

diff --git a/systemd/manager.go b/systemd/manager.go
@@ -28,10 +28,6 @@ import (
 	"github.com/coreos/fleet/unit"
 )
 
-const (
-	DefaultUnitsDirectory = "/run/fleet/units/"
-)
-
 type systemdUnitManager struct {
 	systemd  *dbus.Conn
 	unitsDir string