rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-19 17:38:30 +00:00
Code Issues Releases Wiki Activity

simplistic start

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit
2017-03-07 09:49:28 +10:00
parent 8dc2050fd8
commit 5dbb0f2a28
5 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
cmd/cloudinitsave/cloudinitsave.go
View File

@@ -181,23 +181,24 @@ func getDatasources(cfg *rancherConfig.CloudConfig, network bool) []datasource.D
for _, ds := range cfg.Rancher.CloudInit.Datasources { for _, ds := range cfg.Rancher.CloudInit.Datasources {
parts := strings.SplitN(ds, ":", 2) parts := strings.SplitN(ds, ":", 2)
root := ""
if len(parts) > 1 {
root = parts[1]
}
switch parts[0] { switch parts[0] {
case "ec2": case "ec2":
if network { if network {
if len(parts) == 1 { dss = append(dss, ec2.NewDatasource(root))
dss = append(dss, ec2.NewDatasource(ec2.DefaultAddress))
} else {
dss = append(dss, ec2.NewDatasource(parts[1]))
}
} }
case "file": case "file":
if len(parts) == 2 { if root != "" {
dss = append(dss, file.NewDatasource(parts[1])) dss = append(dss, file.NewDatasource(root))
} }
case "url": case "url":
if network { if network {
if len(parts) == 2 { if root != "" {
dss = append(dss, url.NewDatasource(parts[1])) dss = append(dss, url.NewDatasource(root))
} }
} }
case "cmdline": case "cmdline":
@@ -207,28 +208,24 @@ func getDatasources(cfg *rancherConfig.CloudConfig, network bool) []datasource.D
} }
} }
case "configdrive": case "configdrive":
if len(parts) == 2 { if root != "" {
dss = append(dss, configdrive.NewDatasource(parts[1])) dss = append(dss, configdrive.NewDatasource(root))
} }
case "digitalocean": case "digitalocean":
if network { if network {
if len(parts) == 1 { dss = append(dss, digitalocean.NewDatasource(root))
dss = append(dss, digitalocean.NewDatasource(digitalocean.DefaultAddress))
} else {
dss = append(dss, digitalocean.NewDatasource(parts[1]))
}
} else { } else {
enableDoLinkLocal() enableDoLinkLocal()
} }
case "gce": case "gce":
if network { if network {
dss = append(dss, gce.NewDatasource("http://metadata.google.internal/")) dss = append(dss, gce.NewDatasource(root))
} }
case "packet": case "packet":
if !network { if !network {
enablePacketNetwork(&cfg.Rancher) enablePacketNetwork(&cfg.Rancher)
} }
dss = append(dss, packet.NewDatasource("https://metadata.packet.net/")) dss = append(dss, packet.NewDatasource(root))
} }
} }

3
config/cloudinit/datasource/metadata/digitalocean/metadata.go Normal file → Executable file
View File

@@ -66,6 +66,9 @@ type MetadataService struct {
} }
func NewDatasource(root string) *MetadataService { func NewDatasource(root string) *MetadataService {
if root == "" {
root = DefaultAddress
}
return &MetadataService{Service: metadata.NewDatasource(root, apiVersion, userdataURL, metadataPath, nil)} return &MetadataService{Service: metadata.NewDatasource(root, apiVersion, userdataURL, metadataPath, nil)}
} }

3
config/cloudinit/datasource/metadata/ec2/metadata.go Normal file → Executable file
View File

@@ -39,6 +39,9 @@ type MetadataService struct {
} }
func NewDatasource(root string) *MetadataService { func NewDatasource(root string) *MetadataService {
if root == "" {
root = DefaultAddress
}
return &MetadataService{metadata.NewDatasource(root, apiVersion, userdataPath, metadataPath, nil)} return &MetadataService{metadata.NewDatasource(root, apiVersion, userdataPath, metadataPath, nil)}
} }

4
config/cloudinit/datasource/metadata/gce/metadata.go
View File

@@ -26,6 +26,7 @@ import (
) )
const ( const (
DefaultAddress = "http://metadata.google.internal/"
apiVersion = "computeMetadata/v1/" apiVersion = "computeMetadata/v1/"
metadataPath = apiVersion metadataPath = apiVersion
userdataPath = apiVersion + "instance/attributes/user-data" userdataPath = apiVersion + "instance/attributes/user-data"
@@ -36,6 +37,9 @@ type MetadataService struct {
} }
func NewDatasource(root string) *MetadataService { func NewDatasource(root string) *MetadataService {
if root == "" {
root = DefaultAddress
}
return &MetadataService{metadata.NewDatasource(root, apiVersion, userdataPath, metadataPath, http.Header{"Metadata-Flavor": {"Google"}})} return &MetadataService{metadata.NewDatasource(root, apiVersion, userdataPath, metadataPath, http.Header{"Metadata-Flavor": {"Google"}})}
} }

4
config/cloudinit/datasource/metadata/packet/metadata.go Normal file → Executable file
View File

@@ -62,6 +62,10 @@ type MetadataService struct {
} }
func NewDatasource(root string) *MetadataService { func NewDatasource(root string) *MetadataService {
if root == "" {
root = DefaultAddress
}
return &MetadataService{Service: metadata.NewDatasource(root, apiVersion, userdataURL, metadataPath, nil)} return &MetadataService{Service: metadata.NewDatasource(root, apiVersion, userdataURL, metadataPath, nil)}
} }