rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-10-20 23:14:30 +00:00
Code Issues Releases Wiki Activity

Move the ApplyNetwork back to init where dhcp can run, and fix the tests for scope global

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit
2017-03-28 21:13:22 +10:00
parent 41e02e6f64
commit 748be0ad66
3 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
config/cloudinit/datasource/url/url.go
View File

@@ -45,14 +45,17 @@ func (f *RemoteFile) String() string {
}
func (f *RemoteFile) AvailabilityChanges() bool {
if f.lastError != nil {
// if we have a Network error, then we should retry.
// otherwise, we've made a request to the server, and its said nope.
if _, ok := f.lastError.(pkg.ErrNetwork); !ok {
return false
return false
// TODO: we should trigger something to change the network state
/* if f.lastError != nil {
// if we have a Network error, then we should retry.
// otherwise, we've made a request to the server, and its said nope.
if _, ok := f.lastError.(pkg.ErrNetwork); !ok {
return false
}
}
}
return true
return true
*/
}
func (f *RemoteFile) ConfigRoot() string {