Merge lp:~mvo/snappy/15.04-watchdog-config into lp:~snappy-dev/snappy/15.04-deprecated

[Michael Vogt]

Enable watchdog configuration via ubuntu-core-config

Enable watchdog configuration via ubuntu-core-config

[Sergio Schvezov (sergiusens)]

Looks good, you just have the same error as in the modprobe one:
var [name] [type] = "string" (type is cruft)

review: Needs Fixing

[lp:~mvo/snappy/15.04-watchdog-config]

473. By Michael Vogt on 2015-09-11

merged parent

[Michael Vogt (mvo)]

Fixed, thanks!

review: Approve

=== modified file 'coreconfig/config.go'
--- coreconfig/config.go	2015-09-11 16:21:49 +0000
+++ coreconfig/config.go	2015-09-11 16:21:49 +0000
@@ -42,9 +42,11 @@
 )
 
 var (
-	modprobePath = "/etc/modprobe.d/ubuntu-core.conf"
-	networkRoot  = "/etc/network/interfaces.d/"
-	pppRoot      = "/etc/ppp/"
+	modprobePath        = "/etc/modprobe.d/ubuntu-core.conf"
+	networkRoot         = "/etc/network/interfaces.d/"
+	pppRoot             = "/etc/ppp/"
+	watchdogConfigPath  = "/etc/watchdog.conf"
+	watchdogStartupPath = "/etc/default/watchdog"
 )
 
 // ErrInvalidUnitStatus signals that a unit is not returning a status
@@ -58,11 +60,17 @@
 	Modprobe  *string             `yaml:"modprobe,omitempty"`
 	Network   []passthroughConfig `yaml:"network,omitempty"`
 	PPP       []passthroughConfig `yaml:"ppp,omitempty"`
+	Watchdog  *watchdogConfig     `yaml:"watchdog,omitempty"`
 }
 
 type passthroughConfig struct {
-	Name    string `yaml:"name"`
-	Content string `yaml:"content"`
+	Name    string `yaml:"name,omitempty"`
+	Content string `yaml:"content,omitempty"`
+}
+
+type watchdogConfig struct {
+	Startup string `yaml:"startup,omitempty"`
+	Config  string `yaml:"config,omitempty"`
 }
 
 type coreConfig struct {
@@ -100,6 +108,10 @@
 	if err != nil {
 		return nil, err
 	}
+	watchdog, err := getWatchdog()
+	if err != nil {
+		return nil, err
+	}
 
 	config := &systemConfig{
 		Autopilot: &autopilot,
@@ -108,6 +120,7 @@
 		Modprobe:  &modprobe,
 		Network:   network,
 		PPP:       ppp,
+		Watchdog:  watchdog,
 	}
 
 	return config, nil
@@ -218,6 +231,14 @@
 			if err := setPPP(newConfig.PPP); err != nil {
 				return "", err
 			}
+		case "Watchdog":
+			if oldConfig.Watchdog != nil && *oldConfig.Watchdog == *newConfig.Watchdog {
+				continue
+			}
+
+			if err := setWatchdog(newConfig.Watchdog); err != nil {
+				return "", err
+			}
 		}
 	}
 
@@ -251,16 +272,6 @@
 	return ioutil.WriteFile(tzFile(), []byte(timezone), 0644)
 }
 
-// getModprobe returns the current modprobe config
-var getModprobe = func() (string, error) {
-	modprobe, err := ioutil.ReadFile(modprobePath)
-	if err != nil && !os.IsNotExist(err) {
-		return "", err
-	}
-
-	return string(modprobe), nil
-}
-
 func getPassthrough(rootDir string) (pc []passthroughConfig, err error) {
 	filepath.Walk(rootDir, func(path string, info os.FileInfo, err error) error {
 		if info.IsDir() {
@@ -312,11 +323,51 @@
 	return setPassthrough(pppRoot, pc)
 }
 
+// getModprobe returns the current modprobe config
+var getModprobe = func() (string, error) {
+	modprobe, err := ioutil.ReadFile(modprobePath)
+	if err != nil && !os.IsNotExist(err) {
+		return "", err
+	}
+
+	return string(modprobe), nil
+}
+
 // setModprobe sets the specified modprobe config
 var setModprobe = func(modprobe string) error {
 	return ioutil.WriteFile(modprobePath, []byte(modprobe), 0644)
 }
 
+// getWatchdog returns the current watchdog config
+var getWatchdog = func() (*watchdogConfig, error) {
+	startup, err := ioutil.ReadFile(watchdogStartupPath)
+	if err != nil && !os.IsNotExist(err) {
+		return nil, err
+	}
+	config, err := ioutil.ReadFile(watchdogConfigPath)
+	if err != nil && !os.IsNotExist(err) {
+		return nil, err
+	}
+
+	// nil to make the yaml empty
+	if len(startup) == 0 && len(config) == 0 {
+		return nil, nil
+	}
+
+	return &watchdogConfig{
+		Startup: string(startup),
+		Config:  string(config)}, nil
+}
+
+// setWatchdog sets the specified watchdog config
+var setWatchdog = func(wf *watchdogConfig) error {
+	if err := ioutil.WriteFile(watchdogStartupPath, []byte(wf.Startup), 0644); err != nil {
+		return err
+	}
+
+	return ioutil.WriteFile(watchdogConfigPath, []byte(wf.Config), 0644)
+}
+
 // for testing purposes
 var (
 	cmdAutopilotEnabled = []string{"is-enabled", autopilotTimer}

=== modified file 'coreconfig/config_test.go'
--- coreconfig/config_test.go	2015-09-11 16:21:49 +0000
+++ coreconfig/config_test.go	2015-09-11 16:21:49 +0000
@@ -50,6 +50,8 @@
 	originalModprobePath        = modprobePath
 	originalNetworkRoot         = networkRoot
 	originalPppRoot             = pppRoot
+	originalWatchdogStartupPath = watchdogStartupPath
+	originalWatchdogConfigPath  = watchdogConfigPath
 )
 
 type ConfigTestSuite struct {
@@ -79,6 +81,8 @@
 
 	networkRoot = c.MkDir()
 	pppRoot = c.MkDir()
+	watchdogConfigPath = filepath.Join(c.MkDir(), "watchdog-config")
+	watchdogStartupPath = filepath.Join(c.MkDir(), "watchdog-startup")
 }
 
 func (cts *ConfigTestSuite) TearDownTest(c *C) {
@@ -100,6 +104,8 @@
 	modprobePath = originalModprobePath
 	networkRoot = originalNetworkRoot
 	pppRoot = originalPppRoot
+	watchdogStartupPath = originalWatchdogStartupPath
+	watchdogConfigPath = originalWatchdogConfigPath
 }
 
 // TestGet is a broad test, close enough to be an integration test for
@@ -580,3 +586,56 @@
 	}
 	c.Assert(passthroughEqual(a, b), Equals, false)
 }
+
+func (cts *ConfigTestSuite) TestWatchdogGet(c *C) {
+	startup := "# some startup watchdog config"
+	err := ioutil.WriteFile(watchdogStartupPath, []byte(startup), 0644)
+	c.Assert(err, IsNil)
+
+	config := "# some watchdog config"
+	err = ioutil.WriteFile(watchdogConfigPath, []byte(config), 0644)
+	c.Assert(err, IsNil)
+
+	wc, err := getWatchdog()
+	c.Assert(err, IsNil)
+	c.Assert(wc, DeepEquals, &watchdogConfig{
+		Startup: startup, Config: config,
+	})
+}
+
+func (cts *ConfigTestSuite) TestWatchdogSet(c *C) {
+	wc := &watchdogConfig{
+		Startup: "startup", Config: "secret",
+	}
+	err := setWatchdog(wc)
+	c.Assert(err, IsNil)
+
+	content, err := ioutil.ReadFile(watchdogStartupPath)
+	c.Assert(err, IsNil)
+	c.Assert(string(content), Equals, wc.Startup)
+
+	content, err = ioutil.ReadFile(watchdogConfigPath)
+	c.Assert(err, IsNil)
+	c.Assert(string(content), Equals, wc.Config)
+}
+
+func (cts *ConfigTestSuite) TestWatchdogSetViaYaml(c *C) {
+	input := `
+config:
+  ubuntu-core:
+    watchdog:
+      startup: some startup
+      config: some config
+`
+	_, err := Set(input)
+	c.Assert(err, IsNil)
+
+	// ensure its really there
+	content, err := ioutil.ReadFile(watchdogStartupPath)
+	c.Assert(err, IsNil)
+	c.Assert(string(content), Equals, "some startup")
+
+	content, err = ioutil.ReadFile(watchdogConfigPath)
+	c.Assert(err, IsNil)
+	c.Assert(string(content), Equals, "some config")
+}