rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-16 15:09:27 +00:00
Code Issues Releases Wiki Activity

cloudinit tests pass :)

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit
2017-02-23 01:29:01 +00:00
parent 4f177ee605
commit be2c4044ce
72 changed files with 2683 additions and 1185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/cloudinit/initialize/env.go
View File

@@ -36,7 +36,7 @@ type Environment struct {
substitutions map[string]string
}
// TODO(jonboulle): this is getting unwieldy, should be able to simplify the interface somehow
// NewEnvironment TODO(jonboulle): this is getting unwieldy, should be able to simplify the interface somehow
func NewEnvironment(root, configRoot, workspace, sshKeyName string, metadata datasource.Metadata) *Environment {
firstNonNull := func(ip net.IP, env string) string {
if ip == nil {
@@ -110,7 +110,6 @@ func (e *Environment) DefaultEnvironmentFile() *system.EnvFile {
}
if len(ef.Vars) == 0 {
return nil
} else {
return &ef
}
return &ef
}