github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 10:09:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3429 from zimme/metadata-fix-provider-scaleway

Browse Source 
Fix the Scaleway provider in the metadata package
This commit is contained in:
Rolf Neugebauer 2019-12-19 17:41:10 +00:00 committed by GitHub
commit 80f0765097
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/metadata/provider_scaleway.go
View File

@ -210,11 +210,11 @@ func scalewayGetUserdata() ([]byte, error) {
return nil, errors.New("not able to found a free port below 1024") return nil, errors.New("not able to found a free port below 1024")
} }
defer conn.Close() defer conn.Close()
fmt.Fprintf(conn, "GET /user_data HTTP/1.0\r\n\r\n") fmt.Fprintf(conn, "GET /user_data/cloud-init HTTP/1.0\r\n\r\n")
reader := bufio.NewReader(conn) reader := bufio.NewReader(conn)
resp, err := http.ReadResponse(reader, nil) resp, err := http.ReadResponse(reader, nil)
if err != nil { if err != nil || resp.StatusCode == 404 {
return nil, err return nil, err
} }
defer resp.Body.Close() defer resp.Body.Close()
@ -245,10 +245,7 @@ func (p *ProviderScaleway) handleSSH(metadata []byte) error {
} }
line := string(bytes.Trim(sshKey, "'")) line := string(bytes.Trim(sshKey, "'"))
parts := strings.SplitN(line, " ", 2) rootKeys = rootKeys + line + "\n"
if len(parts) == 2 {
rootKeys = rootKeys + parts[1] + "\n"
}
} }
if err := os.Mkdir(path.Join(ConfigPath, SSH), 0755); err != nil { if err := os.Mkdir(path.Join(ConfigPath, SSH), 0755); err != nil {