rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-12 22:27:59 +00:00
Code Issues Releases Wiki Activity

support guestinfo interface.<n>.ip.<m>.netmask, dns.servers, dns.domains

Browse Source
This commit is contained in:
Sergej Nikolaev 2018-09-26 12:26:57 +03:00
parent 1f50386828
commit 693f9fc108
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
config/cloudinit/datasource/vmware/vmware.go
View File

@ -77,6 +77,13 @@ func (v VMWare) FetchMetadata() (metadata datasource.Metadata, err error) {
} }
metadata.NetworkConfig.DNS.Nameservers = append(metadata.NetworkConfig.DNS.Nameservers, val) metadata.NetworkConfig.DNS.Nameservers = append(metadata.NetworkConfig.DNS.Nameservers, val)
} }
dnsServers, _ := v.read("dns.servers")
for _, val := range strings.Split(dnsServers, ",") {
if val == "" {
break
}
metadata.NetworkConfig.DNS.Nameservers = append(metadata.NetworkConfig.DNS.Nameservers, val)
}
for i := 0; ; i++ { for i := 0; ; i++ {
//if domain := saveConfig("dns.domain.%d", i); domain == "" { //if domain := saveConfig("dns.domain.%d", i); domain == "" {
@ -86,6 +93,13 @@ func (v VMWare) FetchMetadata() (metadata datasource.Metadata, err error) {
} }
metadata.NetworkConfig.DNS.Search = append(metadata.NetworkConfig.DNS.Search, val) metadata.NetworkConfig.DNS.Search = append(metadata.NetworkConfig.DNS.Search, val)
} }
dnsDomains, _ := v.read("dns.domains")
for _, val := range strings.Split(dnsDomains, ",") {
if val == "" {
break
}
metadata.NetworkConfig.DNS.Search = append(metadata.NetworkConfig.DNS.Search, val)
}
metadata.NetworkConfig.Interfaces = make(map[string]netconf.InterfaceConfig) metadata.NetworkConfig.Interfaces = make(map[string]netconf.InterfaceConfig)
found := true found := true
@ -120,6 +134,11 @@ func (v VMWare) FetchMetadata() (metadata datasource.Metadata, err error) {
if address == "" { if address == "" {
break break
} }
netmask, _ := v.read("interface.%d.ip.%d.netmask", i, a)
if netmask != "" {
ones, _ := net.IPMask(net.ParseIP(netmask).To4()).Size()
address = fmt.Sprintf("%s/%d", address, ones)
}
netDevice.Addresses = append(netDevice.Addresses, address) netDevice.Addresses = append(netDevice.Addresses, address)
found = true found = true
netDevice.DHCP = false netDevice.DHCP = false