unistack-org/cloudinit
4
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #218 from crawford/units

Browse Source 
units: Ensure that the units are executed in order
This commit is contained in:
Alex Crawford 2014-09-02 17:40:37 -07:00
commit 1b854eb51e
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
initialize/config.go
View File

@ -291,7 +291,11 @@ func Apply(cfg CloudConfig, env *Environment) error {
// disk, masking/unmasking units, or invoking systemd // disk, masking/unmasking units, or invoking systemd
// commands against units. It returns any error encountered. // commands against units. It returns any error encountered.
func processUnits(units []system.Unit, root string, um system.UnitManager) error { func processUnits(units []system.Unit, root string, um system.UnitManager) error {
commands := make(map[string]string, 0) type action struct {
unit string
command string
}
actions := make([]action, 0, len(units))
reload := false reload := false
for _, unit := range units { for _, unit := range units {
dst := unit.Destination(root) dst := unit.Destination(root)
@ -329,9 +333,9 @@ func processUnits(units []system.Unit, root string, um system.UnitManager) error
} }
if unit.Group() == "network" { if unit.Group() == "network" {
commands["systemd-networkd.service"] = "restart" actions = append(actions, action{"systemd-networkd.service", "restart"})
} else if unit.Command != "" { } else if unit.Command != "" {
commands[unit.Name] = unit.Command actions = append(actions, action{unit.Name, unit.Command})
} }
} }
@ -341,13 +345,13 @@ func processUnits(units []system.Unit, root string, um system.UnitManager) error
} }
} }
for unit, command := range commands { for _, action := range actions {
log.Printf("Calling unit command '%s %s'", command, unit) log.Printf("Calling unit command '%s %s'", action.command, action.unit)
res, err := um.RunUnitCommand(command, unit) res, err := um.RunUnitCommand(action.command, action.unit)
if err != nil { if err != nil {
return err return err
} }
log.Printf("Result of '%s %s': %s", command, unit, res) log.Printf("Result of '%s %s': %s", action.command, action.unit, res)
} }
return nil return nil